Merge branch 'master' of https://git.pixelplanet.fun/ppfun/pixelplanet

Weblate: Translated client (Slovenian)

Weblate: Translated client (Romanian)

Weblate: Translated client (Kazakh)

Weblate: Translated client (Armenian)

Weblate: Translated client (Croatian)

Weblate: Translated client (French)

Weblate: Translated client (Spanish)

Weblate: Translated client (Czech)

Weblate: Translated client (Kashubian)

Weblate: Translated client (Bulgarian)

.gitignore

@@ -3,6 +3,7 @@ timelapse
 output.webm
 utils/ocean-tiles/ocean
 utils/osm-tiles/osm
+utils/rendering
 i18n/*.mo
 test*.js
 utils/rendering

i18n/lccc.json

@@ -5,8 +5,14 @@
   "fa": "ir",
   "hy": "am",
   "ka": "ge",
+<<<<<<< HEAD
+  "kk": "kr",
+  "sl": "si",
+  "sr": "rs"
+=======
   "kk": "kz",
   "sl": "si",
   "sr": "rs",
   "et": "ee"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 }

i18n/ssr-az.po

@@ -93,6 +93,8 @@ msgstr "Parolunuz uğurla dəyişdirildi."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Keçərsiz bağlantı :( Zəhmət olmasa emailinizi yenidən yoxlayın."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobus"
@@ -109,6 +111,7 @@ msgstr "Globusa iki dəfə basaraq geri dön."
 msgid "Loading..."
 msgstr "Yüklənir..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -117,6 +120,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobus"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Bütün xəritəmizin 3D globusu"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Globusa iki dəfə basaraq geri dön."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Yüklənir..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -232,6 +254,8 @@ msgstr "Sadəcə adminlər bunu edəbilər"
 msgid "Mail verification"
 msgstr "Email doğrulaması"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Artıq hesabın doğrulandı :)"
@@ -269,6 +293,7 @@ msgstr "Səhv Parol!"
 msgid "Muted Users can not delete their account."
 msgstr "Susdurulmuş istifadəçilər öz hesablarını silə bilməzlər."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Bu email provayderinə icazə verilmir"
@@ -323,6 +348,66 @@ msgstr "Yeni istifadəçi yaradılamadı :("
 msgid "Failed to establish session after register :("
 msgstr "Hesab oluşdurulurkən bir xəta meydana gəldi :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Email doğrulaması"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Artıq hesabın doğrulandı :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Doğrulama kodun keçərsiz vəya sürəsi dolub :(,Zəhmət olmasa yeni bir tələbdə "
+"bulun."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Siz heç daxil olmamasınız bilə."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Çıxış zamanı server xətası."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Kimliyiniz doğrulanamadı."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Səhv Parol!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun Hesabları"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "15 saniyə sonra avtomatik olaraq yönləndiriləcəksən"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Vəya Pixelplanetə qayıtmaq üçün bura basın ${ clickHere }"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Dünya"
@@ -357,6 +442,16 @@ msgstr "Top10"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 msgstr "2bit"
 
 #: src/canvasesDesc.js:29
@@ -366,6 +461,7 @@ msgstr "Mini xəritə"
 #: src/canvasesDesc.js:32
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Bizim əsas lövhəmiz,dünyanın böyük bir dünya xəritəsi.İstədiyiniz yerə pixel "
 "qoyun"
@@ -380,6 +476,13 @@ msgstr ""
 "qadağandır."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr " başqaları ilə birlikdə 3D lövhə üzərinə kub pixellər yerləşdirin"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Başqaları ilə birlikdə 3D lövhə üzərinə kub pixellər yerləşdirin"
@@ -387,6 +490,7 @@ msgstr "Başqaları ilə birlikdə 3D lövhə üzərinə kub pixellər yerləşd
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "SARS-CoV2 haqqında məlumatlılığı yaymaq üçün xüsusi lövhə"
 
 #: src/canvasesDesc.js:36
@@ -410,6 +514,16 @@ msgstr ""
 "00:00 UTC'də həyata keçirilir."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+
+#: src/canvasesDesc.js:41
+msgid ""
+"Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+"earth canvas."
+msgstr ""
+=======
 #, fuzzy
 msgid "Only four colors. Same rules as moon!"
 msgstr "Yalnız 4 rəng. Ay ilə eyni qaydalar."
@@ -422,6 +536,7 @@ msgid ""
 msgstr ""
 "Daha kiçik bir dünyada qorunmuş okean ilə torpaq işğal et. Dünya lövhəsi ilə "
 "gözləmə müddəti paylaşır."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-be.po

@@ -97,6 +97,8 @@ msgstr "Пароль паспяхова зменены."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Няправільны URL :( Калі ласка, праверце сваю пошту яшчэ раз."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D Глобус"
@@ -113,6 +115,7 @@ msgstr "Каб вярнуцца, двойчы націсніце па глобу
 msgid "Loading..."
 msgstr "Загрузка..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ппфан"
@@ -121,6 +124,25 @@ msgstr "ппфан"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "Усплывальнае акно PixelPlanet.Fun"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3D Глобус"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "3D Глобус усёй нашай мапы"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Каб вярнуцца, двойчы націсніце па глобусу."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Загрузка..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -237,6 +259,8 @@ msgstr "Толькі адміністратары могуць гэта рабі
 msgid "Mail verification"
 msgstr "Спраўджанне пошты"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Цяпер вы спраўджаны :)"
@@ -273,6 +297,7 @@ msgstr "Няправільны пароль!"
 msgid "Muted Users can not delete their account."
 msgstr ""
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Гэты email-правайдэр забанены"
@@ -326,6 +351,66 @@ msgstr "Не атрымалася стварыць новага карыстал
 msgid "Failed to establish session after register :("
 msgstr "Не атрымалася стварыць сэсію пасля рэгістрацыі :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Спраўджанне пошты"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Цяпер вы спраўджаны :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Ваш код спраўджання пошты няправільны або ужо не працуе :(, калі ласка, "
+"запытайце новы."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Вы нават не ўвайшлі ў акаўнт."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Памылка сервера пры выхадзе з акаўнту."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Вы не аўтарызаваны."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Няправільны пароль!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "Акаўнты PixelPlanet.fun"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Вы будзеце аўтаматычна перанакіраваныя праз 15с"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Альбо ${ clickHere } каб вярнуцца да pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Зямля"
@@ -367,8 +452,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Наша галоўнае палатно, вялізарная мапа свету. Стаўце пікселі дзе заўгодна"
 
@@ -381,6 +470,13 @@ msgstr ""
 "(калі гэта ня частка малюнку), ці малюнкаў больш за 1.5k x 1.5k пікселяў."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Стаўце вокселі на 3D палатне разам з іншымі"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Стаўце вокселі на 3D палатне разам з іншымі"
@@ -388,6 +484,7 @@ msgstr "Стаўце вокселі на 3D палатне разам з інш
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Асаблівае палатно, прызванае распаўсюджваць дасведчанасць аб SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -411,13 +508,21 @@ msgstr ""
 "дзень у 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-bg.po

@@ -2,19 +2,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+=======
 "PO-Revision-Date: 2024-03-11 20:59+0000\n"
 "Last-Translator: \"Д. Савовъ\" <bofondido@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/bg/>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.4.2\n"
+
+#: src/core/ChatProvider.js:434
+msgid "You can not send chat messages with proxy"
+=======
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Не можете да пращате съобщения с proxy"
 
 #: src/core/ChatProvider.js:436
@@ -41,7 +55,11 @@ msgstr "Заглушен сте за още ${ timeMin } минути"
 #: src/core/ChatProvider.js:450
 #, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
+<<<<<<< HEAD
+msgstr "Заглушен сте за още ${ ttl  } секунди"
+=======
 msgstr "Заглушен сте за още ${ ttl } секунди"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:467
 #, javascript-format
@@ -87,12 +105,27 @@ msgstr "Този потребител не съществува в нашите
 
 #: src/routes/reset_password.js:89
 msgid "Password successfully changed."
+<<<<<<< HEAD
+msgstr "Паролата Ви е успешно променена."
+=======
 msgstr "Паролата е сменена успешно."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/reset_password.js:108
 msgid "Invalid url :( Please check your mail again."
 msgstr "Невалиден URL адрес :( Моля проверете си имейла отново."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr "ppfun"
+
+#: src/ssr/PopUp.jsx:48
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.Fun изкачащ прозорец"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DГлобус"
@@ -109,6 +142,8 @@ msgstr "Кликнете два пъти на глобуса, за да се в
 msgid "Loading..."
 msgstr "Зарежда се..."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -117,6 +152,7 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun изкачащ прозорец"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -211,10 +247,13 @@ msgstr "Потвърждаване на новата парола"
 msgid "Submit"
 msgstr "Изпращане"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "Не сте баннати"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Не сте логнати"
@@ -227,6 +266,49 @@ msgstr "Нямате достъп до тази страница"
 msgid "Just admins can do that"
 msgstr "Само администраторите имат право на това"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Не сте баннати"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Този имейл доставчик не е разрешен"
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Не е дадена Captcha"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Имейлът вече се използва."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Потребителското име вече се използва."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Отне Ви прекалено много време, опитайте отново."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Сбъркахте Captcha-та"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Неизвестна грешка на Captcha-та"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Неуспешно създаване на нов потребител :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Неуспешно установяване на сесия след регистрация :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Потвърждение на имейла"
@@ -264,6 +346,13 @@ msgid "Incorrect password!"
 msgstr "Грешна парола!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr "Заглушени потребители не могат да изтрият техния профил."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr "Заглушени потребители не могат да изтрият техния профил."
 
@@ -273,6 +362,7 @@ msgstr "Този имейл доставчик не е разрешен"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Заглушени потребители не могат да правят това."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -288,6 +378,8 @@ msgstr "Ще бъдете автоматично пренасочени след
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Или ${ clickHere }, за да се върнете обратно в pixeplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Не е дадена Captcha"
@@ -320,6 +412,7 @@ msgstr "Неуспешно създаване на нов потребител :
 msgid "Failed to establish session after register :("
 msgstr "Неуспешно установяване на сесия след регистрация :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Земя"
@@ -354,6 +447,19 @@ msgstr "Топ10"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr ""
+"Нашето главно платно, огромна карта на света. Поставяйте навсякъде, където "
+"желаете"
+=======
 msgstr "2bit"
 
 #: src/canvasesDesc.js:29
@@ -365,6 +471,7 @@ msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr ""
 "Нашето главно платно, огромна карта на света. Поставяйте навсякъде, където "
 "желаете!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:33
 msgid ""
@@ -375,12 +482,21 @@ msgstr ""
 "(освен част от рисунка) или рисунка по-голяма от 1.5хил x 1.5хил пиксели."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Слагайте воксели на 3D платно с други"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Специално платно за разпространяване на информация за SARS-CoV2"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Слагайте воксели на 3D платно с други."
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Специално платно за разпространяване на информация за SARS-CoV2."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -403,16 +519,26 @@ msgstr ""
 "класирането в 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Само четири цвята. Същите правила като на луната!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+=======
 "earth canvas!"
 msgstr ""
 "Превземете земя на по-малка земя със защитен океан. Споделя cooldown с "
 "платното на Земята!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format
@@ -483,7 +609,11 @@ msgid ""
 "requested this mail was ${ ip })."
 msgstr ""
 "Ако не сте заявили този имейл, моля игнорирайте го (IP-то заявило този имейл "
+<<<<<<< HEAD
+"беше ${ ip })"
+=======
 "беше ${ ip })."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:114
 msgid "Mail is not configured on the server"

i18n/ssr-ca.po

@@ -13,8 +13,12 @@ msgstr ""
 "X-Generator: Poedit 3.0.1\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+=======
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "No pots enviar missatges al xat amb un proxy"
 
 #: src/core/ChatProvider.js:436
@@ -97,6 +101,18 @@ msgid "Invalid url :( Please check your mail again."
 msgstr ""
 "URL invàlida :( Si us plau comprova el teu correu electrònic un altre cop."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.fun"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun Món3D"
@@ -113,6 +129,13 @@ msgstr "Doble clic a la bola del món per tornar enrere."
 msgid "Loading..."
 msgstr "Carregant..."
 
+<<<<<<< HEAD
+#: src/ssr/Main.jsx:65
+#, fuzzy
+msgid "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
+
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -127,6 +150,7 @@ msgstr "PixelPlanet.fun"
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
@@ -219,11 +243,14 @@ msgstr "Confirma la contrasenya nova"
 msgid "Submit"
 msgstr "Envia"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
 msgstr "No estàs verificat."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "No has iniciat sessió"
@@ -236,6 +263,50 @@ msgstr "No tens permís per accedir a aquesta pàgina"
 msgid "Just admins can do that"
 msgstr "Només els administradors poden fer això"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "No estàs verificat."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "No s'ha rebut el captcha"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "El correu electrònic ja està en ús."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "El nom d'usuari ja està en ús."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Has trigat massa, prova-ho un altre cop."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Has fallat el captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Error de captcha desconegut"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "No s'ha pogut crear un nou usuari :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "No s'ha pogut establir la sessió després del registre :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Verificació del correu electrònic"
@@ -274,6 +345,13 @@ msgid "Incorrect password!"
 msgstr "Contrasenya incorrecta!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -283,6 +361,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -298,6 +377,8 @@ msgstr "Seràs redirigit automàticament al cap de 15 segons"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "O ${ clickHere } per tornar a PixelPlanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "No s'ha rebut el captcha"
@@ -330,6 +411,7 @@ msgstr "No s'ha pogut crear un nou usuari :("
 msgid "Failed to establish session after register :("
 msgstr "No s'ha pogut establir la sessió després del registre :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Terra"
@@ -371,8 +453,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "El nostre llenç principal, un enorme mapa del món. Col·loca allà on vulguis"
 
@@ -386,6 +472,13 @@ msgstr ""
 "píxels."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Col·loca voxels en un llenç 3D amb altres jugadors"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Col·loca voxels en un llenç 3D amb altres jugadors"
@@ -393,6 +486,7 @@ msgstr "Col·loca voxels en un llenç 3D amb altres jugadors"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Llenç especial per conscienciar sobre el SARS-CoV-2"
 
 #: src/canvasesDesc.js:36
@@ -416,13 +510,21 @@ msgstr ""
 "diària s'actualitza a les 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-csb.po

@@ -2,20 +2,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+=======
 "PO-Revision-Date: 2024-03-10 19:37+0000\n"
 "Last-Translator: FOXHELL <foxhell768@gmail.com>\n"
 "Language-Team: Kashubian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/csb/>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language: csb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+<<<<<<< HEAD
+"X-Generator: Poedit 3.4.2\n"
+
+#: src/core/ChatProvider.js:434
+msgid "You can not send chat messages with proxy"
+=======
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Të ni mòżesz sélac wiadów czej môsz proxy"
 
 #: src/core/ChatProvider.js:436
@@ -95,6 +108,17 @@ msgstr "Ùdało sã zmienic parolã."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Lëchi lënk :( Sprôwdzë le swòjégò e-maila jesz rôz."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr "ppfun"
+
+#: src/ssr/PopUp.jsx:48
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.Fun PopUp"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -109,6 +133,9 @@ msgstr "Przëcesni zemską kùglã dwakroc żebë copnąc."
 
 #: src/ssr/Globe.jsx:52
 msgid "Loading..."
+<<<<<<< HEAD
+msgstr "Ładowanie..."
+=======
 msgstr "Ładowónié..."
 
 #: src/ssr/PopUp.jsx:47
@@ -118,6 +145,7 @@ msgstr "ppfun"
 #: src/ssr/PopUp.jsx:48
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
@@ -142,7 +170,11 @@ msgstr "E-mail ni mòże miec wicy jak 40 merków."
 
 #: src/utils/validation.js:20
 msgid "Email should at least contain a dot"
+<<<<<<< HEAD
+msgstr "E-mail mùszi miec w sobie co nômni jeden póńkt."
+=======
 msgstr "E-mail mùszi miec w sobie co nômni jeden póńkt"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:22
 msgid "Email should contain a @"
@@ -170,7 +202,11 @@ msgstr "Të nie pòdôł parolë."
 
 #: src/utils/validation.js:56
 msgid "Password must be at least 6 characters long."
+<<<<<<< HEAD
+msgstr "Parola mùszi miec bënômni 6 znaków."
+=======
 msgstr "Paróla mùszi miec co nômni 6 merków."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:59
 msgid "Password must be shorter than 60 characters."
@@ -214,10 +250,13 @@ msgstr "Pòcwierdzë Nową Parolã"
 msgid "Submit"
 msgstr "Przeslë"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "Të nie jes zbanowóny"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Të nie jes zalogòwóny"
@@ -228,7 +267,51 @@ msgstr "Të ni môsz ùdowierzeniô do przistãpù do ti starnë"
 
 #: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
+<<<<<<< HEAD
+msgstr "Leno sprôwnicë mògą to robic "
+
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Të nie jes zbanowóny"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Ten dotëgòwôcz adrésë e-mail nie je dozwòlony"
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Captcha nie òsta pòdónô"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-mail ju w ùżëcym."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Pòzwa brëkòwnika ju w ùżëcym."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "To za wiele zeszło, spróbùj jesz rôz."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Nie weszło cë z Captchą"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Nieznónô fela Captchë"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Nie ùdało sã stwòrzëc nowégò brëkòwnika :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Nie ùdało sã ùsadzëc sesje pò registracje :("
+=======
 msgstr "Leno sprôwnicë mògą to robic"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
@@ -252,13 +335,21 @@ msgstr "Të nawetka zalogòwóny nie jes."
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
 msgid "Server error when logging out."
+<<<<<<< HEAD
+msgstr "Fela serwera w czasu wëlogòwiwóniégò"
+=======
 msgstr "Fela serwera w czasu wëlogòwiwóniégò."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:44
 #: src/routes/api/auth/change_passwd.js:34
 #: src/routes/api/auth/delete_account.js:36
 msgid "You are not authenticated."
+<<<<<<< HEAD
+msgstr "Të nie przeszedł aùtentikacje"
+=======
 msgstr "Të nie przeszedł aùtentikacje."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:53
 #: src/routes/api/auth/change_passwd.js:43
@@ -267,6 +358,13 @@ msgid "Incorrect password!"
 msgstr "Złô parola!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr "Wëcëszony brëkòwnicë ni mògą rëmnąc swòjégò kònta."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 #, fuzzy
 msgid "Muted Users can not delete their account."
 msgstr "Wëcëszony brëkòwnicë ni mògą rëmnąc swòjégò kònta."
@@ -278,6 +376,7 @@ msgstr "Ten dotëgòwôcz adrésë e-mail nie je dozwòlony"
 #: src/routes/api/auth/change_mail.js:62
 #, fuzzy
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Wëcëszony brëkòwnicë ni mògą tegò robic."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -293,6 +392,8 @@ msgstr "Òstóniesz aùtomaticzno przekôzóny dali pò 15 sekùndach"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Abò ${ clickHere } żebë warcëc do pixelplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Captcha nie òsta pòdónô"
@@ -325,6 +426,7 @@ msgstr "Nie ùdało sã stwòrzëc nowégò brëkòwnika :("
 msgid "Failed to establish session after register :("
 msgstr "Nie ùdało sã ùsadzëc sesje pò registracje :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemia"
@@ -363,11 +465,18 @@ msgstr "2bit"
 
 #: src/canvasesDesc.js:29
 msgid "Minimap"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 msgstr "Minimap"
 
 #: src/canvasesDesc.js:32
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Najé przédné płótno, stolëmnô kôrta Swiata. Stawiôj gdze le cë sã widzy"
 
@@ -378,6 +487,16 @@ msgid ""
 msgstr ""
 "Miesądzowé płótno. Bezpiecznô rëmiô dlô malënków. Niżôdnëch fanów ani "
 "wiôldżich nôpisów (chëba że jakno part malënkù) ani malënków wikszich jak "
+<<<<<<< HEAD
+"1.5 tës. x 1.5. tës. pikselów!"
+
+#: src/canvasesDesc.js:34
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Stawiôj wòksele na płótnie 3D z jinszima"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 "1.5 tës. x 1.5. tës. pikselów."
 
 #: src/canvasesDesc.js:34
@@ -388,6 +507,7 @@ msgstr "Stawiôj wòksele na płótnie 3D z jinszima"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Òsoblëwé płótno do rozkòscérzaniégò swiądë ò SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -411,21 +531,33 @@ msgstr ""
 "òdnôwiô ò 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 #, fuzzy
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Leno czterë farwë. Taczé same regle jak na miesądzu."
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66
 #, javascript-format
 msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
 msgstr ""
+<<<<<<< HEAD
+"Witôj na PixelPlanet, ${ name }! Proszã, dôj  sprawdzëc swòjã adrésã e-mail"
+=======
 "Witôj na PixelPlanet, ${ name }! Proszã, dôj sprawdzëc swòjã adrésã e-mail"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:67
 #, javascript-format
@@ -438,7 +570,11 @@ msgid ""
 "have to verify your mail. You can do that here: "
 msgstr ""
 "Witôj w naji môłi spòleznie pikslostôwków. Żebë ùżëwac swòjégò kònta, "
+<<<<<<< HEAD
+"mùszisz dac adrésã e-mail do sprôwdzeniô. Mòżesz to zrobic tuwò:"
+=======
 "mùszisz dac adrésã e-mail do sprôwdzeniô. Mòżesz to zrobic tuwò: "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:68
 msgid "Click to Verify"
@@ -481,7 +617,11 @@ msgid ""
 "next 30min here: "
 msgstr ""
 "Të pòprosył ò ùdostónié nowi parólë. Mòżesz zmienic so parólã w pòstãpnëch "
+<<<<<<< HEAD
+"trzëdzescë minutach tuwò:"
+=======
 "trzëdzescë minutach tuwò: "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:106
 #, javascript-format
@@ -501,7 +641,11 @@ msgid ""
 "We already sent you a mail with instructions. Please wait before requesting "
 "another mail."
 msgstr ""
+<<<<<<< HEAD
+"Më cë ju sélele e-maila ze wskôzama. Pòżdżë le nigle mdzes prosył ò drëdżégò"
+=======
 "Më cë ju sélele e-maila ze wskôzama. Pòżdżë le nigle mdzes prosył ò drëdżégò."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:130
 msgid "Couldn't find this mail in our database"

i18n/ssr-cz.po

@@ -22,6 +22,10 @@ msgid "Your country is temporary muted from this chat channel"
 msgstr "Tvůj stát je prozatím umlčený z tohoto chat kanálu"
 
 #: src/core/ChatProvider.js:439
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "You are permanently muted, join our guilded to appeal the mute"
 msgstr ""
 "Dostali jsi permanentní mute, připoj se na náš guilded aby sis ho mohl "
@@ -87,6 +91,10 @@ msgid "User doesn't exist in our database :("
 msgstr "Uživatelské jméno neexistuje v naší databázi :("
 
 #: src/routes/reset_password.js:89
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "Password successfully changed."
 msgstr "Heslo úspěšně změněno."
 
@@ -94,6 +102,8 @@ msgstr "Heslo úspěšně změněno."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Neplatná URL :( Prosím znovu zkontroluj svůj email."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D planeta"
@@ -110,6 +120,7 @@ msgstr "Dvakrát klikni na glóbus aby jsi šel zpátky na plátno."
 msgid "Loading..."
 msgstr "Načítaní..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -118,6 +129,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobe"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "3D mapa naší celej mapy"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Dvakrát klikní na globus aby si šel zpátky"
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Načítaní..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -229,6 +259,15 @@ msgstr "Nejste povolen na tuhle stránků"
 msgid "Just admins can do that"
 msgstr "Pouze admini to můžou dělat"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Nejste zabanován"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Tenhle email dodavatel tu není povolen"
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Ověřování mailu"
@@ -246,11 +285,66 @@ msgstr "Váš ověřující kód mailu je již neplatný :(, prosím poproste o
 #: src/routes/api/auth/logout.js:11
 msgid "You are not even logged in."
 msgstr "Nejste ani přihlášen."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
 msgid "Server error when logging out."
 msgstr "Serverová chyba při odhlašování."
 
+<<<<<<< HEAD
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-mail je už používán"
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Jméno je už používáno"
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Trvalo vám to až moc dlouho, zkuste znovu."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Nepodařila se vám vaše captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Neznáma chyba captcha"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Nepodařilo se udělat nového uživatele :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Nepodařilo se vytvořit schůzi hned po registraci :("
+
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Ověřování mailu"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Od teď jste ověřen"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Váš mailovej ověřující kód je již neplatný :(, prosím poproste o novej."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Nejste ani přihlášen"
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Serverová chyba při odhlašování"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:44
 #: src/routes/api/auth/change_passwd.js:34
 #: src/routes/api/auth/delete_account.js:36
@@ -264,6 +358,14 @@ msgid "Incorrect password!"
 msgstr "Nesprávné heslo!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+=======
 msgid "Muted Users can not delete their account."
 msgstr "Ztlumení uživatelé nemohou si odstranit účet."
 
@@ -274,6 +376,7 @@ msgstr "Tenhle dodavatel emailů tu není povolen"
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Ztlumění hráči toto udělat nemohou."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -288,6 +391,12 @@ msgstr "Budete automaticky přesměrován po 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Nebo ${ clickHere } aby ses dostal zpátky na pixelplanet"
 
+<<<<<<< HEAD
+#: src/canvasesDesc.js:20
+msgid "Earth"
+msgstr "Zem"
+
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Žádna zadaná Captcha"
@@ -324,6 +433,7 @@ msgstr "Nepodařilo se vytvořit schůzi hned po registraci :("
 msgid "Earth"
 msgstr "Země"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:21
 msgid "Moon"
 msgstr "Měsíc"
@@ -338,7 +448,11 @@ msgstr "Coronavirus"
 
 #: src/canvasesDesc.js:24
 msgid "PixelZone"
+<<<<<<< HEAD
+msgstr "Pixelzone"
+=======
 msgstr "PixelZone"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:25
 msgid "PixelCanvas"
@@ -354,6 +468,18 @@ msgstr "Top10"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr "Naše hlavní plátno, velká mapa země. Pokládejte kde chcete"
+
+=======
 msgstr "2bit"
 
 #: src/canvasesDesc.js:29
@@ -364,6 +490,7 @@ msgstr "Minimapa"
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr "Naše hlavní plátno, obří mapa světa. Pokládejte kde budete chtít!"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:33
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of art) "
@@ -373,6 +500,14 @@ msgstr ""
 "(pouze jestli to není část obrazu) nebo obrazy větší jak 1,5k x 1,5k pixelů."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Polož Voxely na 3D plátno s ostatníma"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Speciální plátno pro zvýšení pozornosti o SARS-CoV2"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Polož Voxely na 3D plátno s ostatními."
 
@@ -380,6 +515,7 @@ msgstr "Polož Voxely na 3D plátno s ostatními."
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr ""
 "Speciální plátno pro zvýšení pozornosti o SARS-CoV2 (nechte se očkovat)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -413,8 +549,22 @@ msgstr ""
 "Obsaďte území na menší zemi s chráněným oceánem. Sděluje cooldown s plátnem "
 "země."
 
+#: src/canvasesDesc.js:40
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+
+#: src/canvasesDesc.js:41
+msgid ""
+"Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+"earth canvas."
+msgstr ""
+
 #: src/core/MailProvider.js:66
+<<<<<<< HEAD
+#, fuzzy, javascript-format
+=======
 #, javascript-format
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
 msgstr "Vítej ${ name } na PixelPlanet, prosím ověř svůj mail"
 
@@ -440,6 +590,7 @@ msgid "Or by copying following url:"
 msgstr "Nebo zkopírůj tohle URL:"
 
 #: src/core/MailProvider.js:69
+#, fuzzy
 msgid ""
 "Have fun and don't hesitate to contact us if you encounter any problems :)"
 msgstr "Měj zábavů a neboj se nás kontaktovat jestli najdeš nějaký problémy :)"

i18n/ssr-da.po

@@ -95,6 +95,8 @@ msgstr "Ændrede Adgangskode succesfuldt."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Ugyldig url :( Venligst tjek din mail igen."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobus"
@@ -111,6 +113,7 @@ msgstr "Dobbeltklik på kloden for at gå tilbage."
 msgid "Loading..."
 msgstr "Indlæser..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -119,6 +122,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobus"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "En 3D klode af hele vores kort"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Dobbeltklik på kloden for at gå tilbage."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Indlæser..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -234,6 +256,8 @@ msgstr "Kun administratorer kan gøre det"
 msgid "Mail verification"
 msgstr "Mail Bekræftelse"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Du er nu bekræftet"
@@ -270,6 +294,7 @@ msgstr "Forkerte adgangskode!"
 msgid "Muted Users can not delete their account."
 msgstr "Stummet brugere kan ikke slette deres konto."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Denne email udbyder er ikke tilladt"
@@ -323,6 +348,66 @@ msgstr "Kunne ikke oprette ny bruger :("
 msgid "Failed to establish session after register :("
 msgstr "Kunne ikke oprette session efter registrering :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Mail Bekræftelse"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Du er nu bekræftet"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Din mail bekræftelseskode er ugyldig eller allerede udløbet :(, venligst "
+"anmod om en ny en."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Du er engang logget in."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Server fejl ved log ud."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Du er ikke godkendt."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Forkerte adgangskode!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun Kontoer"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Du vil blive automatisk omdirigeret efter 15s"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Eller ${ clickHere } for at gå tilbage til pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Jorden"
@@ -357,6 +442,18 @@ msgstr "Top10"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr "Vores hovedkanvas, et kæmpe verdenskort. Placer hvor end du vil"
+
+=======
 msgstr "2bit"
 
 #: src/canvasesDesc.js:29
@@ -367,6 +464,7 @@ msgstr "Minikort"
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr "Vores hovedkanvas, et kæmpe verdenskort. Placer hvor end du vil!"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:33
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of art) "
@@ -376,12 +474,21 @@ msgstr ""
 "hvis del af kunst) eller større end 1,5k x 1,5k pixels."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Placer Voxels på et 3D kanvas med andre"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Specielt kanvas for at sprede viden om SARS-CoV2"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Placer Voxels på et 3D kanvas med andre"
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Specielt kanvas for at sprede viden om SARS-CoV2 (tag vaccinen)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -404,16 +511,26 @@ msgstr ""
 "rangering opdaterer kl. 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Kun fire farver. Samme regler som måne!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+=======
 "earth canvas!"
 msgstr ""
 "Erobrer land på et mindrere verdenskort med beskyttet hav. Deler nedkøling "
 "med kanvasset Jorden!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-de.po

@@ -2,8 +2,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2024-03-09 14:00+0000\n"
+"Last-Translator: HF <hf@pixelplanet.fun>\n"
+=======
 "PO-Revision-Date: 2024-03-21 18:40+0000\n"
 "Last-Translator: Luno <lunovitaredux@gmail.com>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language-Team: German <https://hosted.weblate.org/projects/pixelplanet/"
 "server/de/>\n"
 "Language: de\n"
@@ -14,8 +19,13 @@ msgstr ""
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+msgstr "Du kannst keine Nachrichten senden wenn du ein Proxy benutzt"
+=======
 msgid "You can not send chat messages while using a proxy"
 msgstr "Du kannst keine Nachrichten senden während du ein Proxy benutzt"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:436
 msgid "Your country is temporary muted from this chat channel"
@@ -94,6 +104,17 @@ msgstr "Passwort erfolgreich geändert."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Ungültige Adresse :( Bitte kontrolliere die Mail nochmal."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr "ppfun"
+
+#: src/ssr/PopUp.jsx:48
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.Fun PopUp"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D Globus"
@@ -110,6 +131,8 @@ msgstr "Doppelklick um zurück zu gehen."
 msgid "Loading..."
 msgstr "Lade..."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -118,6 +141,7 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -132,7 +156,11 @@ msgstr "E-Mail Feld kann nicht leer sein."
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
+<<<<<<< HEAD
+msgstr "E-Mail sollte mindestens 5 Zeichen lang sein."
+=======
 msgstr "Email sollte zumindest 5 Zeichen lang sein."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:19
 msgid "Email can't be longer than 40 characters."
@@ -160,7 +188,11 @@ msgstr "Name muss kleiner als 26 Zeichen sein"
 
 #: src/utils/validation.js:38
 msgid "Name contains invalid character like @, /, \\ or #"
+<<<<<<< HEAD
+msgstr "Name beinhalted ungültige Zeichen wie @,/.\\ oder #"
+=======
 msgstr "Ungültige Zeichen im Namen wie @,/.\\ oder #"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:53
 msgid "No password given."
@@ -212,10 +244,13 @@ msgstr "Neues Passwort bestätigen"
 msgid "Submit"
 msgstr "Absenden"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "Du bist nicht verbannt"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Du bist nicht angemeldet"
@@ -228,6 +263,49 @@ msgstr "Du hast keinen Zugriff zu diese Seite"
 msgid "Just admins can do that"
 msgstr "Nur Administratoren können dies tun"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Du bist nicht verbannt"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Dieser E-Mail Anbieter ist nicht erlaubt"
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Kein Captcha angegeben"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-Mail wird bereits verwendet."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Name wird bereits verwendet."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Du hast zu lange benötigt, versuche es noch einmal."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Captcha Text ist falsch"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Unbekannter Captcha-Fehler"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Konnte keinen neuen Benutzer erstellen :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Konnte keine Sitzung nach registrierung starten :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "E-Mail verifizieren"
@@ -265,6 +343,13 @@ msgid "Incorrect password!"
 msgstr "Falsches Passwort!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr "Stumme Spieler sind nicht erlaubt, ihre Konto zu löschen."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr "Stumme Spieler sind nicht erlaubt, ihre Konto zu löschen."
 
@@ -274,6 +359,7 @@ msgstr "Dieser E-Mail Anbieter ist nicht erlaubt"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Stumme Spieler können das nicht tun."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -289,6 +375,8 @@ msgstr "Du wirst automatisch weitergeleitet nach 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Oder ${ clickHere } um zu pixelplanet zurückzukehren"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Kein Captcha angegeben"
@@ -321,6 +409,7 @@ msgstr "Konnte keinen neuen Benutzer erstellen :("
 msgid "Failed to establish session after register :("
 msgstr "Konnte keine Sitzung nach registrierung starten :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Erde"
@@ -356,6 +445,18 @@ msgstr "Top10"
 #: src/canvasesDesc.js:28
 msgid "2bit"
 msgstr "2bit"
+<<<<<<< HEAD
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr "Kleine Karte"
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr ""
+"Unsere Hauptleinwand, eine große Weltkarte. Zeichnen ist überall möglich"
+
+=======
 
 #: src/canvasesDesc.js:29
 msgid "Minimap"
@@ -366,6 +467,7 @@ msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr ""
 "Unsere Hauptleinwand, eine große Weltkarte. Zeichnen ist überall möglich!"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:33
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of art) "
@@ -375,12 +477,21 @@ msgstr ""
 "Teil von Kunst und nicht größer als 1,5k x 1,5k pixels."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Zeichne mit Voxeln in einer 3D Umgebung"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Kleine Leinwand im SARS-CoV2 Thema"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Zeichne mit Voxel in einer 3D Umgebung."
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Kleine Leinwand im SARS-CoV2 Thema."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -403,16 +514,28 @@ msgstr ""
 "wird um 00:00 UTC aktualisiert."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr "Nur vier Farben. Gleiche Regeln wie auf Mond."
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Nur vier Farben. Gleiche Regeln wie auf Mond!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+"Erobere Land auf einer kleineren Erde mit beschützten Ozeanen. Teilt seine "
+"Abklingzeit mit Erde."
+=======
 "earth canvas!"
 msgstr ""
 "Erobere Land auf einer kleineren Erde mit beschützten Ozeanen. Teilt seine "
 "Abklingzeit mit Erde!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-eo.po

@@ -13,8 +13,12 @@ msgstr ""
 "X-Generator: Poedit 2.4.1\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+=======
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Ne povas sendi babilmensaĵojn kun prokura servilo"
 
 #: src/core/ChatProvider.js:436
@@ -94,10 +98,26 @@ msgstr "Pasvorton Malerare Ŝanĝita."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Nevalida URL ŭwŭ. Relegu vian retpostmensaĝujon."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.fun"
+
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobo"
 
+=======
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobo"
+
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:38
 msgid "A 3D globe of our whole map"
 msgstr "3D globo de nia tuta mapo"
@@ -110,6 +130,8 @@ msgstr "Duoble klaku je la globo por reiri."
 msgid "Loading..."
 msgstr "Ŝarĝadanta..."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -119,6 +141,7 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
@@ -215,11 +238,14 @@ msgstr "Verigu Novan Pasvorton"
 msgid "Submit"
 msgstr "Alsendu"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
 msgstr "Vi ne estas aŭtentigita."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 #, fuzzy
 msgid "You are not logged in"
@@ -234,6 +260,51 @@ msgstr "Malhavas l' permes' je l' kanal'"
 msgid "Just admins can do that"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Vi ne estas aŭtentigita."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Pasvorton ne donita."
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Retpostadreso jam uzata."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Uzantnomo jam uzata."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr ""
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr ""
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr ""
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Malsukcesis krei novan uzanton ŭwŭ"
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Malsukcesis krei novan ligon post reĝistro"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Retpostmensaĝa verigo"
@@ -271,6 +342,13 @@ msgid "Incorrect password!"
 msgstr "Pasvorto erara!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -280,6 +358,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -295,6 +374,8 @@ msgstr "Aŭte redirektos vin post 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Aŭ ${ clickHere } reeniri al pixelplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 #, fuzzy
 msgid "No Captcha given"
@@ -328,6 +409,7 @@ msgstr "Malsukcesis krei novan uzanton ŭwŭ"
 msgid "Failed to establish session after register :("
 msgstr "Malsukcesis krei novan ligon post reĝistro"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "L' Mond'"
@@ -369,8 +451,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Nia ĉefa kanvaso, granda mapo de l' mond'. Metus en ajn lokon"
 
 #: src/canvasesDesc.js:33
@@ -383,6 +469,13 @@ msgstr ""
 "texta (krom se parto da arto)"
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Metu Vokselojn je 3D canvas kun aliaj fekuloj"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Metu Vokselojn je 3D canvas kun aliaj fekuloj"
@@ -390,6 +483,7 @@ msgstr "Metu Vokselojn je 3D canvas kun aliaj fekuloj"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Aparta kanvaso por disvastigi konecon de SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -411,13 +505,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-es.po

@@ -13,8 +13,12 @@ msgstr ""
 "X-Generator: Poedit 2.4.2\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+=======
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "No se pueden enviar mensajes de chat con proxy"
 
 #: src/core/ChatProvider.js:436
@@ -96,6 +100,8 @@ msgstr "Contraseña cambiada exitosamente."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Url inválida :( Por favor revisa tu correo nuevamente."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "Globo 3D de PixelPlanet.Fun"
@@ -112,6 +118,7 @@ msgstr "Haz doble clic en el globo para regresar."
 msgid "Loading..."
 msgstr "Cargando..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -121,6 +128,23 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "Globo 3D de PixelPlanet.Fun"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Un globo 3D para nuestro mapa completo"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Haz doble clic en el globo para regresar."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Cargando..."
+
 #: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
@@ -171,6 +195,58 @@ msgstr "El nombre contiene caracteres inválidos como @, /, \\ o #"
 msgid "No password given."
 msgstr "No se ingresó una contraseña."
 
+=======
+#: src/ssr/Main.jsx:65
+#, fuzzy
+msgid "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
+
+#: src/ssr/Main.jsx:66
+msgid "Place color pixels on an map styled canvas with other players online"
+msgstr "Coloca píxeles de colores en un lienzo con otros jugadores en línea"
+
+#: src/utils/validation.js:17
+msgid "Email can't be empty."
+msgstr "El campo de correo no puede estar vacío."
+
+#: src/utils/validation.js:18
+msgid "Email should be at least 5 characters long."
+msgstr "El correo debe tener al menos 5 caracteres de largo."
+
+#: src/utils/validation.js:19
+msgid "Email can't be longer than 40 characters."
+msgstr "El correo no puede tener más de 40 caracteres."
+
+#: src/utils/validation.js:20
+msgid "Email should at least contain a dot"
+msgstr "El correo debe contener al menos un punto"
+
+#: src/utils/validation.js:22
+msgid "Email should contain a @"
+msgstr "El correo debe contener una @"
+
+#: src/utils/validation.js:29
+msgid "Name can't be empty."
+msgstr "El campo de nombre no puede estar vacío."
+
+#: src/utils/validation.js:30
+#, fuzzy
+msgid "Name must be at least 2 characters long"
+msgstr "El nombre debe tener al menos 4 caracteres de largo"
+
+#: src/utils/validation.js:31
+msgid "Name must be shorter than 26 characters"
+msgstr "El correo debe tener menos de 26 caracteres"
+
+#: src/utils/validation.js:38
+msgid "Name contains invalid character like @, /, \\ or #"
+msgstr "El nombre contiene caracteres inválidos como @, /, \\ o #"
+
+#: src/utils/validation.js:53
+msgid "No password given."
+msgstr "No se ingresó una contraseña."
+
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/utils/validation.js:56
 msgid "Password must be at least 6 characters long."
 msgstr "La contraseña debe tener al menos 6 caracteres de largo."
@@ -217,6 +293,18 @@ msgstr "Confirmar Contraseña Nueva"
 msgid "Submit"
 msgstr "Enviar"
 
+<<<<<<< HEAD
+#: src/routes/api/modtools.js:53
+#, fuzzy
+msgid "You are not logged in"
+msgstr "Ni siquiera has iniciado sesión."
+
+#: src/routes/api/modtools.js:65
+#, fuzzy
+msgid "You are not allowed to access this page"
+msgstr "No tienes acceso a este canal"
+
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
@@ -232,10 +320,56 @@ msgstr "Ni siquiera has iniciado sesión."
 msgid "You are not allowed to access this page"
 msgstr "No tienes acceso a este canal"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "No estás autenticado."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "No se envió ningún texto para el captcha"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "El correo electrónico ya se encuentra en uso."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "El nombre de usuario ya se encuentra en uso."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Te tardaste demasiado, inténtalo de nuevo."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr ""
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Error de Captcha Desconocido"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "No se pudo crear el nuevo usuario :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "No se pudo establecer sesión después de registrar :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Verificación de correo"
@@ -274,6 +408,13 @@ msgid "Incorrect password!"
 msgstr "¡Contraseña incorrecta!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -283,6 +424,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -298,6 +440,8 @@ msgstr "Se te redirigirá automáticamente después de 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "O  ${ clickHere } oara volver a pixelplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 #, fuzzy
 msgid "No Captcha given"
@@ -331,6 +475,7 @@ msgstr "No se pudo crear el nuevo usuario :("
 msgid "Failed to establish session after register :("
 msgstr "No se pudo establecer sesión después de registrar :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Tierra"
@@ -372,8 +517,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Nuestro lienzo principal, un enorme mapa del mundo. Coloca donde quieras"
 
@@ -387,6 +536,13 @@ msgstr ""
 "1.5k píxeles."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Coloca vóxeles en un lienzo 3D junto a otros"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Coloca vóxeles en un lienzo 3D junto a otros"
@@ -394,6 +550,7 @@ msgstr "Coloca vóxeles en un lienzo 3D junto a otros"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Lienzo especial para crear conciencia sobre el virus SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -415,13 +572,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-fa.po

@@ -94,6 +94,8 @@ msgstr "رمز عبور با موفقیت تغییر کرد."
 msgid "Invalid url :( Please check your mail again."
 msgstr "آدرس اینترنتی نامعتبر :( لطفا دوباره ایمیل خود را بررسی کنید."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr ""
@@ -110,6 +112,7 @@ msgstr "برای بازگشت بر روی globe دوبار کلیک کنید."
 msgid "Loading..."
 msgstr "بارگذاری..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -118,6 +121,25 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr ""
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "یک کره سه بعدی از کل نقشه ما"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "برای بازگشت بر روی globe دوبار کلیک کنید."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "بارگذاری..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr ""
@@ -228,6 +250,11 @@ msgstr "شما اجازه دسترسی به این صفحه را ندارید"
 msgid "Just admins can do that"
 msgstr "فقط ادمین ها میتونن این کار رو بکنن"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "تو بن نشدی"
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "تایید ایمیل"
@@ -267,6 +294,7 @@ msgstr "رمزت رو غلط وارد کردی!"
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
 msgstr ""
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
@@ -321,6 +349,66 @@ msgstr "کاربر جدید ایجاد نشد :("
 msgid "Failed to establish session after register :("
 msgstr "تشکیل جلسه پس از ثبت نام انجام نشد :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "تایید ایمیل"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "الان تایید شدی :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"کد تأیید ایمیل شما نامعتبر است یا قبلاً منقضی شده است :(، لطفاً یک کد جدید "
+"درخواست کنید."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "تو حتی وارد هم نشدی."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "خطای سرور هنگام خروج از سیستم."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "شما احراز هویت نشده اید."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "رمزت رو غلط وارد کردی!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "حساب‌های PixelPlanet.fun"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "پس از 15 ثانیه به طور خودکار هدایت می شوید"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "یا ${ clickHere } تا به پیکسل پلنت برگردی"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "زمین"
@@ -362,8 +450,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "بوم اصلی ما، نقشه عظیمی از جهان است. هر جایی که دوست دارید پیکسل قرار دهید"
 
@@ -376,6 +468,13 @@ msgstr ""
 "هنری بزرگتر از 1.5k × 1.5k پیکسل باشد."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Voxels را روی بوم سه بعدی با دیگران قرار دهید"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Voxels را روی بوم سه بعدی با دیگران قرار دهید"
@@ -383,6 +482,7 @@ msgstr "Voxels را روی بوم سه بعدی با دیگران قرار ده
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "یک بوم مخصوص برای آگاهی رسانی درمورد ویروس کرونا"
 
 #: src/canvasesDesc.js:36
@@ -406,13 +506,21 @@ msgstr ""
 "00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-fr.po

@@ -13,8 +13,12 @@ msgstr ""
 "X-Generator: Poedit 3.0\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+=======
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Vous ne pouvez pas écrire sur le chat via un proxy"
 
 #: src/core/ChatProvider.js:436
@@ -98,6 +102,18 @@ msgstr "Le mot de passe a été modifié avec succès."
 msgid "Invalid url :( Please check your mail again."
 msgstr "URL invalide :( Veuillez encore consulter votre courriel."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.fun"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -114,6 +130,13 @@ msgstr "Double-cliquez sur le globe pour retourner."
 msgid "Loading..."
 msgstr "Chargement..."
 
+<<<<<<< HEAD
+#: src/ssr/Main.jsx:65
+#, fuzzy
+msgid "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
+
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -128,6 +151,7 @@ msgstr "PixelPlanet.fun"
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
@@ -221,6 +245,13 @@ msgstr "Confirmer nouveau mot de passe"
 msgid "Submit"
 msgstr "Soumettre"
 
+<<<<<<< HEAD
+#: src/routes/api/modtools.js:53
+#, fuzzy
+msgid "You are not logged in"
+msgstr "Vous n'êtes même pas connecté."
+
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
@@ -231,6 +262,7 @@ msgstr "Vous n'êtes pas autorisé."
 msgid "You are not logged in"
 msgstr "Vous n'êtes même pas connecté."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:65
 #, fuzzy
 msgid "You are not allowed to access this page"
@@ -240,6 +272,51 @@ msgstr "Vous n'avez pas accès à ce salon"
 msgid "Just admins can do that"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Vous n'êtes pas autorisé."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Aucun texte de captcha donné"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Ce courriel est déjà utilisé."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Ce nom est déjà utilisé."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Vous avez mis trop de temps, veuillez réessayer."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Vous avez échoué votre captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Erreur de captcha inconnue"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Impossible de créer un nouveau compte :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Impossible d'établir une session après l'inscription :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Vérification du courriel"
@@ -278,6 +355,13 @@ msgid "Incorrect password!"
 msgstr "Mauvais mot de passe !"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -287,6 +371,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -302,6 +387,8 @@ msgstr "Vous serez redirigé automatiquement après 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Ou ${ clickHere } pour retourner à PixelPlanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 #, fuzzy
 msgid "No Captcha given"
@@ -335,6 +422,7 @@ msgstr "Impossible de créer un nouveau compte :("
 msgid "Failed to establish session after register :("
 msgstr "Impossible d'établir une session après l'inscription :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "La terre"
@@ -376,8 +464,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Notre toile principale, une grande carte du monde. Placez où vous voulez"
 
@@ -391,6 +483,13 @@ msgstr ""
 "1.5k x 1.5k pixels ne sont pas autorisés."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Placez des cubes sur une toile 3D avec d'autres joueurs"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Placez des cubes sur une toile 3D avec d'autres joueurs"
@@ -398,6 +497,7 @@ msgstr "Placez des cubes sur une toile 3D avec d'autres joueurs"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Une toile spéciale pour sensibiliser la population au SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -419,13 +519,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-gr.po

@@ -98,6 +98,8 @@ msgstr "Ο κωδικός πρόσβασης άλλαξε με επιτυχία.
 msgid "Invalid url :( Please check your mail again."
 msgstr "Μη έγκυρη διεύθυνση url :( Ελέγξτε ξανά το mail σας."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -114,6 +116,7 @@ msgstr "Κάντε διπλό κλικ στο globe για να επιστρέψ
 msgid "Loading..."
 msgstr "Φόρτωση.."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -122,6 +125,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobe"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Μια τρισδιάστατη σφαίρα ολόκληρου του χάρτη μας"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Κάντε διπλό κλικ στο globe για να επιστρέψετε."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Φόρτωση.."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -235,6 +257,11 @@ msgstr "Δεν επιτρέπεται η πρόσβαση σε αυτή τη σ
 msgid "Just admins can do that"
 msgstr "Μόνο οι διαχειριστές μπορούν να το κάνουν αυτό"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Δεν είσαι απαγορευμένος"
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Επαλήθευση mail"
@@ -274,6 +301,7 @@ msgstr "Λάθος κωδικός!"
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
 msgstr ""
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
@@ -328,6 +356,66 @@ msgstr "Αποτυχία δημιουργίας νέου χρήστη :("
 msgid "Failed to establish session after register :("
 msgstr "Απέτυχε η δημιουργία συνεδρίας μετά την εγγραφή :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Επαλήθευση mail"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Είσαι πλέον επαληθευμένος :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Ο κωδικός επαλήθευσης της αλληλογραφίας σας δεν είναι έγκυρος ή έχει ήδη "
+"λήξει :(, ζητήστε νέο."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Δεν είστε καν συνδεδεμένος."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Σφάλμα διακομιστή κατά την αποσύνδεση."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Δεν έχετε πιστοποιηθεί."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Λάθος κωδικός!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "Λογαριασμοί PixelPlanet.fun"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Θα ανακατευθυνθείτε αυτόματα μετά από 15 δευτερόλεπτα"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Ή ${ clickHere } για να επιστρέψετε στο pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Gh"
@@ -369,8 +457,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Ο κύριος καμβάς μας, ένας τεράστιος χάρτης του κόσμου. Τοποθετήστε όπου "
 "θέλετε"
@@ -384,6 +476,13 @@ msgstr ""
 "(εκτός αν είναι μέρος της τέχνης) ή τέχνη μεγαλύτερη από 1,5k x 1,5k pixel."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Τοποθετήστε Voxel σε έναν τρισδιάστατο καμβά μαζί με άλλους"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Τοποθετήστε Voxel σε έναν τρισδιάστατο καμβά μαζί με άλλους"
@@ -391,6 +490,7 @@ msgstr "Τοποθετήστε Voxel σε έναν τρισδιάστατο κα
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Ειδικός καμβάς για τη διάδοση της ευαισθητοποίησης του SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -414,13 +514,21 @@ msgstr ""
 "Καθημερινές ενημερώσεις κατάταξης στις 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-hr.po

@@ -2,17 +2,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+=======
 "PO-Revision-Date: 2024-03-15 20:29+0000\n"
 "Last-Translator: Antonio <srbomrz@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Croatian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/hr/>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+<<<<<<< HEAD
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"X-Generator: Poedit 3.4.2\n"
+=======
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.5-dev\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
@@ -95,6 +106,8 @@ msgstr "Lozinka je uspješno promijenjena."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Nevažeći url :( Molimo ponovno provjerite svoju poštu."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobus"
@@ -111,6 +124,7 @@ msgstr "Dvaput kliknite na globus za povratak."
 msgid "Loading..."
 msgstr "Učitavam..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -119,6 +133,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobus"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "3D globus naše cijele karte"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Dvaput kliknite na globus za povratak."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Učitavam..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -182,7 +215,16 @@ msgstr "PixelPlanet.fun Ponovno postavljanje lozinke"
 
 #: src/ssr/PasswordReset.jsx:21 src/ssr/PasswordReset.jsx:41
 msgid "Reset your password here"
+<<<<<<< HEAD
+msgstr "Ponovno postavite lozinku ovdje."
+
+#: src/core/MailProvider.js:105 src/ssr/PasswordReset.jsx:28
+#: src/ssr/PasswordReset.jsx:49
+msgid "Reset Password"
+msgstr "Ponovno postavite lozinku."
+=======
 msgstr "Ponovno postavite lozinku ovdje"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:105 src/ssr/PasswordReset.jsx:28
 #: src/ssr/PasswordReset.jsx:49
@@ -230,6 +272,12 @@ msgstr "Nije vam dopušten pristup ovoj stranici"
 msgid "Just admins can do that"
 msgstr "To mogu samo administratori"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Niste banani."
+
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Provjera pošte"
@@ -269,6 +317,7 @@ msgstr "Netočna lozinka!"
 msgid "Muted Users can not delete their account."
 msgstr "Utišani korisnici ne mogu izbrisati svoj račun."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Ovaj pružatelj usluge e-pošte nije dopušten"
@@ -322,6 +371,65 @@ msgstr "Nije uspjelo stvaranje novog korisnika :("
 msgid "Failed to establish session after register :("
 msgstr "Nije uspjelo uspostavljanje sesije nakon registracije :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Provjera pošte"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Već ste potvrđeni :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Vaš kod za provjeru pošte je nevažeći ili je već istekao :(, zatražite novi."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Niste čak ni prijavljeni."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Pogreška poslužitelja prilikom odjave."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Niste autentificirani."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Netočna lozinka!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr "Isključeni korisnici ne mogu izbrisati svoj račun."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr "Isključeni korisnici to ne mogu učiniti."
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun računi"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Bit ćete automatski preusmjereni nakon 15 s"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Ili ${ clickHere } da se vratite na pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemlja"
@@ -356,6 +464,34 @@ msgstr "Top10"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr "Naše glavno platno, ogromna karta svijeta. Stavite gdje god želite"
+
+#: src/canvasesDesc.js:33
+msgid ""
+"Moon canvas. Safe space for art. No flags or large text (unless part of art) "
+"or art larger than 1.5k x 1.5k pixels."
+msgstr ""
+"Mjesečevo platno. Siguran prostor za umjetnost. Bez zastava ili velikog "
+"teksta (osim ako je dio slike) ili slike veće od 1,5k x 1,5k piksela."
+
+#: src/canvasesDesc.js:34
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Postavite Voxele na 3D platno s drugima"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Posebno platno za širenje svijesti o SARS-CoV2"
+
+=======
 msgstr "2bit"
 
 #: src/canvasesDesc.js:29
@@ -382,6 +518,7 @@ msgstr "Postavite Voxele na 3D platno s drugima."
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Posebno platno za širenje svijesti o SARS-CoV2."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
 msgstr "Ogledalo PixelZone-a"
@@ -403,16 +540,26 @@ msgstr ""
 "00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Samo četiri boje. Ista pravila kao i mjesec!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+=======
 "earth canvas!"
 msgstr ""
 "Osvojite zemlju na manjoj zemlji sa zaštićenim oceanom. Dijeli hlađenje sa "
 "zemljanim platnom!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format
@@ -430,7 +577,11 @@ msgid ""
 "have to verify your mail. You can do that here: "
 msgstr ""
 "dobrodošli u našu malu zajednicu postavljača pixela (pičkovca), da biste "
+<<<<<<< HEAD
+"koristili svoj račun, morate potvrditi svoju poštu. To možete učiniti ovdje:"
+=======
 "koristili svoj račun, morate potvrditi svoju poštu. To možete učiniti ovdje: "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:68
 msgid "Click to Verify"
@@ -473,7 +624,11 @@ msgid ""
 "next 30min here: "
 msgstr ""
 "Zatražili ste novu lozinku. Svoju lozinku možete promijeniti u sljedećih 30 "
+<<<<<<< HEAD
+"minuta ovdje:"
+=======
 "minuta ovdje: "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:106
 #, javascript-format

i18n/ssr-hu.po

@@ -2,19 +2,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+=======
 "PO-Revision-Date: 2024-03-21 04:54+0000\n"
 "Last-Translator: Antonio <srbomrz@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/hu/>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.4.2\n"
+
+#: src/core/ChatProvider.js:434
+msgid "You can not send chat messages with proxy"
+=======
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Proxyval nem küldhetsz üzenetet"
 
 #: src/core/ChatProvider.js:436
@@ -95,6 +109,8 @@ msgstr "Sikeresen megváltoztattad a jelszót."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Érvénytelen link :( Kérjük, ellenőrizd újra a leveled."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D földgömb"
@@ -111,6 +127,7 @@ msgstr "Kattints duplán a földgömbre a visszatéréshez."
 msgid "Loading..."
 msgstr "Betöltés..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -119,6 +136,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun felugró"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3D földgömb"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "3D-s földgömb az egész térképünkről"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Kattints duplán a földgömbre a visszatéréshez."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Betöltés..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -134,7 +170,11 @@ msgstr "Az e-mail cím nem lehet üres."
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
+<<<<<<< HEAD
+msgstr "Az e-mail címnek legalább 5 karakter hosszúnak kell lennie."
+=======
 msgstr "Az e-mail címnek legalább 5 karakterből kell állnia."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:19
 msgid "Email can't be longer than 40 characters."
@@ -234,6 +274,8 @@ msgstr "Ezt csak az adminok tehetik meg"
 msgid "Mail verification"
 msgstr "E-mail hitelesítés"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Mostantól hitelesített vagy :)"
@@ -269,6 +311,7 @@ msgstr "Hibás jelszó!"
 msgid "Muted Users can not delete their account."
 msgstr "A némított felhasználók nem törölhetik fiókjukat."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Ez az e-mail szolgáltató nem engedélyezett"
@@ -322,6 +365,65 @@ msgstr "Nem sikerült új felhasználót létrehozni :("
 msgid "Failed to establish session after register :("
 msgstr "Nem sikerült létrehozni a munkamenetet a regisztráció után :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "E-mail hitelesítés"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Mostantól hitelesített vagy :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"A leveled hitelesítő kódja érvénytelen vagy már lejárt :(, kérj egy újat."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Még csak be sem vagy jelentkezve."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Szerverhiba a kijelentkezéskor."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Nem vagy hitelesítve."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Hibás jelszó!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr "A némított felhasználók nem törölhetik fiókjukat."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr "A némított felhasználók nem tehetik meg ezt."
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun fiókok"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Automatikusan átirányítunk 15 másodperc múlva"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Vagy ${ clickHere } a pixelplanetre való visszatéréshez"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Föld"
@@ -363,8 +465,13 @@ msgid "Minimap"
 msgstr "Kistérkép"
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr "A fő vásznunk egy hatalmas világtérkép. Azt rajzolsz rá, amit akarsz"
+=======
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr "A fő vásznunk egy hatalmas világtérkép. Azt rajzolsz rá, amit akarsz!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:33
 msgid ""
@@ -376,12 +483,21 @@ msgstr ""
 "nagyobb rajz."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Helyezz el voxeleket egy 3D-s vászonra, másokkal együtt"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Speciális vászon a SARS-CoV2 terjesztésére"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Helyezz el voxeleket egy 3D-s vászonra, másokkal együtt."
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Speciális vászon a SARS-CoV2 terjesztésére."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -404,16 +520,28 @@ msgstr ""
 "00:00-kor frissül."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr "Csak négy szín. Ugyanazok a szabályok, mint a holdnál."
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Csak négy szín. Ugyanazok a szabályok, mint a holdnál!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+"Hódítsd meg a területet egy kisebb földön, védett óceánnal. Közös töltési "
+"idővel rendelkezik a földvászonnal."
+=======
 "earth canvas!"
 msgstr ""
 "Hódítsd meg a területet egy kisebb földön, védett óceánnal. Közös töltési "
 "idővel rendelkezik a földvászonnal!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-hy.po

@@ -2,14 +2,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+=======
 "PO-Revision-Date: 2024-03-12 19:57+0000\n"
 "Last-Translator: Alen <alen.mankyan7@gmail.com>\n"
 "Language-Team: Armenian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/hy/>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#: src/core/ChatProvider.js:434
+msgid "You can not send chat messages with proxy"
+msgstr "Դուք չեք կարող պռուկսիի միջոցով զրուցում հաղորդագրություն ուղարկել"
+
+#: src/core/ChatProvider.js:436
+#, fuzzy
+msgid "Your country is temporary muted from this chat channel"
+msgstr "Ձեր երկիրը ժամանակավորապես անջատված է զրույցից"
+=======
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
@@ -20,18 +39,29 @@ msgstr "Դուք չեք կարող proxy օգտագործելու ժամանակ
 #: src/core/ChatProvider.js:436
 msgid "Your country is temporary muted from this chat channel"
 msgstr "Ձեր երկիրը ժամանակավորապես անջատված է այս զրույցի ալիքից"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:439
 msgid "You are permanently muted, join our guilded to appeal the mute"
 msgstr "Դուք ընդմիշտ խլացված եք, միացեք մեր guilded բողոքարկելու համար"
 
 #: src/core/ChatProvider.js:441
+<<<<<<< HEAD
+#, fuzzy
+msgid "You are banned"
+msgstr "Դուք վավերացված չեք:"
+
+#: src/core/ChatProvider.js:443
+msgid "Your Internet Provider is banned"
+msgstr ""
+=======
 msgid "You are banned"
 msgstr "Դուք արգելված եք"
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
 msgstr "Ձեր ինտերնետ-մատակարարն արգելված է"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
@@ -39,9 +69,15 @@ msgid "You are muted for another ${ timeMin } minutes"
 msgstr "Դուք խլացված եք ևս ${timeMin} ր"
 
 #: src/core/ChatProvider.js:450
+<<<<<<< HEAD
+#, fuzzy, javascript-format
+msgid "You are muted for another ${ ttl } seconds"
+msgstr "Դուք խլացված եք ևս ${ ttl } վրկ"
+=======
 #, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
 msgstr "Դուք խլացված եք ևս ${ ttl } վայրկյան"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:467
 #, javascript-format
@@ -88,12 +124,28 @@ msgstr "Օգտագործողը գոյություն չունի մեր տվյալ
 
 #: src/routes/reset_password.js:89
 msgid "Password successfully changed."
+<<<<<<< HEAD
+msgstr "Գաղտնաբառը հաջողությամբ փոխվեծ է:"
+=======
 msgstr "Գաղտնաբառը հաջողությամբ փոխվեց:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/reset_password.js:108
 msgid "Invalid url :( Please check your mail again."
 msgstr "Անվավեր url :( Խնդրում ենք կրկին ստուգել ձեր փոստը:"
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.fun"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D Գլոբուս"
@@ -104,6 +156,18 @@ msgstr "Ամբողջ քարտեզի 3D գլոբուսը"
 
 #: src/ssr/Globe.jsx:51
 msgid "Double click on globe to go back."
+<<<<<<< HEAD
+msgstr "Կրկնակի կտտացրեք գլոբուսին ՝ վերադառնալու համար:"
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Բեռնվում է..."
+
+#: src/ssr/Main.jsx:65
+#, fuzzy
+msgid "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
+=======
 msgstr "Կրկնակի կտտացրեք գնդին՝ հետ վերադառնալու համար:"
 
 #: src/ssr/Globe.jsx:52
@@ -121,6 +185,7 @@ msgstr "PixelPlanet.Fun-ի ելնող պատուհան"
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
@@ -128,6 +193,25 @@ msgstr "Տեղադրեք գունավոր պիքսելներ քարտեզանմ
 
 #: src/utils/validation.js:17
 msgid "Email can't be empty."
+<<<<<<< HEAD
+msgstr "Փոստը չի կարող դատարկ լինել:"
+
+#: src/utils/validation.js:18
+msgid "Email should be at least 5 characters long."
+msgstr "Փոստը պետք է կազմի առնվազն 5 նիշ:"
+
+#: src/utils/validation.js:19
+msgid "Email can't be longer than 40 characters."
+msgstr "Փոստը չի կարող 40 նիշից ավելի լինել:"
+
+#: src/utils/validation.js:20
+msgid "Email should at least contain a dot"
+msgstr "Փոստը առնվազն կետ պետք է պարունակի"
+
+#: src/utils/validation.js:22
+msgid "Email should contain a @"
+msgstr "Փոստը պետք է պարունակի @"
+=======
 msgstr "Էլ. փոստը չի կարող դատարկ լինել:"
 
 #: src/utils/validation.js:18
@@ -145,14 +229,21 @@ msgstr "Էլ. փոստը պետք է առնվազն պարունակի կետ"
 #: src/utils/validation.js:22
 msgid "Email should contain a @"
 msgstr "Էլ. փոստը պետք է պարունակի @"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
 msgstr "Անունը չի կարող դատարկ լինել:"
 
 #: src/utils/validation.js:30
+<<<<<<< HEAD
+#, fuzzy
+msgid "Name must be at least 2 characters long"
+msgstr "Անունը պետք է կազմի առնվազն 4 նիշ"
+=======
 msgid "Name must be at least 2 characters long"
 msgstr "Անունը պետք է կազմի առնվազն 2 նիշ"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:31
 msgid "Name must be shorter than 26 characters"
@@ -202,7 +293,11 @@ msgstr "Ողջույն ${name}, այստեղ կարող եք գրել ձեր ն
 
 #: src/ssr/PasswordReset.jsx:54
 msgid "New Password"
+<<<<<<< HEAD
+msgstr "Նոր ծածկագիր"
+=======
 msgstr "Նոր գաղտնաբառ"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/PasswordReset.jsx:60
 msgid "Confirm New Password"
@@ -210,6 +305,65 @@ msgstr "Հաստատեք նոր գաղտնաբառը"
 
 #: src/ssr/PasswordReset.jsx:65
 msgid "Submit"
+<<<<<<< HEAD
+msgstr "Ներկայացնել"
+
+#: src/routes/api/modtools.js:53
+#, fuzzy
+msgid "You are not logged in"
+msgstr "Դուք նույնիսկ մուտք չեք գործել:"
+
+#: src/routes/api/modtools.js:65
+#, fuzzy
+msgid "You are not allowed to access this page"
+msgstr "Այս ալիքը ձեզ համար հասանելի չէ"
+
+#: src/routes/api/modtools.js:207
+msgid "Just admins can do that"
+msgstr ""
+
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Դուք վավերացված չեք:"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Գաղտնաբառ չի տրվել:"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Այս փոստը արդեն օգտագործվում է."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Այս անունը արդեն զբաղված է."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr ""
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr ""
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr ""
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Չհաջողվեց ստեղծել նոր օգտվող :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Գրանցվելուց հետո չհաջողվեց ստեղծել նստաշրջան :("
+=======
 msgstr "Հաստատել"
 
 #: src/routes/api/baninfo.js:32
@@ -227,6 +381,7 @@ msgstr "Ձեզ չի թույլատրվում մուտք գործել այս էջ
 #: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Միայն ադմինները կարող են դա անել"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
@@ -250,7 +405,11 @@ msgstr "Դուք նույնիսկ մուտք չեք գործել:"
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
 msgid "Server error when logging out."
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Սերվերի սխալ՝ դուրս գալուց:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:44
 #: src/routes/api/auth/change_passwd.js:34
@@ -265,6 +424,14 @@ msgid "Incorrect password!"
 msgstr "Սխալ գաղտնաբառ!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+=======
 msgid "Muted Users can not delete their account."
 msgstr "Լռեցված օգտատերերը չեն կարող ջնջել իրենց հաշիվը:"
 
@@ -275,6 +442,7 @@ msgstr "Այս էլփոստի մատակարարը չի թույլատրվում
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Լռեցված օգտատերերը չեն կարող դա անել:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -289,6 +457,8 @@ msgstr "15 վրկ հետո դուք ավտոմատ կերպով կուղղորդ
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Կամ ${clickHere} ՝ pixelplanet վերադառնալու համար"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Captcha չի տրվել"
@@ -321,6 +491,7 @@ msgstr "Չհաջողվեց ստեղծել նոր օգտվող :("
 msgid "Failed to establish session after register :("
 msgstr "Գրանցվելուց հետո չհաջողվեց ստեղծել նստաշրջան :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Երկիր"
@@ -351,6 +522,26 @@ msgstr "1Բիթ"
 
 #: src/canvasesDesc.js:27
 msgid "Top10"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:28
+msgid "2bit"
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr ""
+"Մեր գլխավոր կտավը ՝ աշխարհի հսկայական քարտեզն է: Տեղադրեք ամենուր, որտեղ ձեզ "
+"դուր է գալիս"
+
+#: src/canvasesDesc.js:33
+#, fuzzy
+=======
 msgstr "Թոփ10"
 
 #: src/canvasesDesc.js:28
@@ -368,10 +559,27 @@ msgstr ""
 "դուր է գալիս:"
 
 #: src/canvasesDesc.js:33
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of art) "
 "or art larger than 1.5k x 1.5k pixels."
 msgstr ""
+<<<<<<< HEAD
+"Լուսնի կտավ: Արվեստի համար անվտանգ տարածք: Ոչ մի դրոշ կամ մեծ տեքստ "
+"(բացառությամբ արվեստի մի մասի)"
+
+#: src/canvasesDesc.js:34
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Տեղադրեք ոկսելներն 3D կտավի վրա ուրիշների հետ"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Հատուկ կտավ `SARS-CoV2- ի իրազեկությունը տարածելու համար"
+
+#: src/canvasesDesc.js:36
+msgid "Mirror of PixelZone"
+msgstr "ՊիքսելԳոտիի հայելին"
+=======
 "Լուսնի կտավ: Ապահով տարածք արվեստի համար: Առանց դրոշների կամ մեծ տեքստ (եթե "
 "դա արվեստի մաս չէ) կամ 1,5k x 1,5k պիքսելից մեծ արվեստ:"
 
@@ -386,6 +594,7 @@ msgstr "Հատուկ կտավ `SARS-CoV2- ի իրազեկությունը տար
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
 msgstr "ՊիքսելԳոտի-ի հայելին"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:37
 msgid "Mirror of PixelCanvas"
@@ -400,25 +609,41 @@ msgid ""
 "A canvas for the most active players from the the previous day. Daily "
 "ranking updates at 00:00 UTC."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/canvasesDesc.js:40
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+=======
 "Կտավ նախորդ օրվա ամենաակտիվ խաղացողների համար։ Ամենօրյա վարկանիշային "
 "թարմացումները 00:00 UTC-ին:"
 
 #: src/canvasesDesc.js:40
 msgid "Only four colors. Same rules as moon!"
 msgstr "Ընդամենը չորս գույն: Նույն կանոնները, ինչպես լուսնում:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+=======
 "earth canvas!"
 msgstr ""
 "Նվաճեք հողերը ավելի փոքր Երկրի վրա՝ պաշտպանված օվկիանոսով: Վերականգնման "
 "ժամանակը կապված է Երկրի կտավի հետ:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format
 msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
+<<<<<<< HEAD
+msgstr "Բարի գալուստ ${name} PixelPlanet, խնդրում ենք ստուգել ձեր փոստը"
+=======
 msgstr "Բարի գալուստ ${name} PixelPlanet, խնդրում ենք ստուգել ձեր էլ. փոստը"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 # Թառքմանել է Նարեկ Ադամյանը ։)
 #: src/core/MailProvider.js:67
@@ -431,6 +656,14 @@ msgid ""
 "welcome to our little community of pixelplacers, to use your account, you "
 "have to verify your mail. You can do that here: "
 msgstr ""
+<<<<<<< HEAD
+"Բարի գալուստ pixelplacers-ի մեր փոքրիկ համայնք, ձեր հաշիվն օգտագործելու "
+"համար պետք է ստուգեք ձեր փոստը: Դա կարող եք անել այստեղ ՝"
+
+#: src/core/MailProvider.js:68
+msgid "Click to Verify"
+msgstr "Սեղմեք ՝ Ստուգելու համար"
+=======
 "Բարի գալուստ մեր պիքսել տեափղադրողների փոքրիկ համայնք, ձեր հաշիվն "
 "օգտագործելու համար դուք պետք է հաստատեք ձեր փոստը: Դուք կարող եք դա անել "
 "այստեղ՝ "
@@ -438,6 +671,7 @@ msgstr ""
 #: src/core/MailProvider.js:68
 msgid "Click to Verify"
 msgstr "Սեղմեք, հաստատվելու համար"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:68 src/core/MailProvider.js:105
 msgid "Or by copying following url:"
@@ -446,7 +680,12 @@ msgstr "Կամ պատճենելով հետևյալ url- ը ՝"
 #: src/core/MailProvider.js:69
 msgid ""
 "Have fun and don't hesitate to contact us if you encounter any problems :)"
+<<<<<<< HEAD
+msgstr ""
+"Զվարճացեք և մի ամոթ արեք կապնվել մեզ հետ, եթե խրախուսում եք որևէ խնդիր :)"
+=======
 msgstr "Զվարճացեք և մի ամաչեք կապնվել մեզ հետ, եթե տեսնում եք որևէ խնդիր :)"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:70 src/core/MailProvider.js:107
 msgid "Thanks"
@@ -459,7 +698,11 @@ msgid ""
 "${ minLeft } minutes."
 msgstr ""
 "Մենք ձեզ արդեն ուղարկել ենք ստուգման նամակ, ${minLeft} րոպեից կարող եք "
+<<<<<<< HEAD
+"պահանջել մեկ այլ:"
+=======
 "պահանջել մեկ այլ նամակ:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:103
 msgid "You forgot your password for PixelPlanet? Get a new one here"
@@ -474,8 +717,13 @@ msgid ""
 "You requested to get a new password. You can change your password within the "
 "next 30min here: "
 msgstr ""
+<<<<<<< HEAD
+"Դուք խնդրել եք ձեռք բերել նոր գաղտնաբառ: Հաջորդ 30 րոպեի ընթացքում կարող եք "
+"փոխել ձեր գաղտնաբառը ՝"
+=======
 "Դուք հայցել եք ստանալ նոր գաղտնաբառը: Հաջորդ 30 րոպեի ընթացքում կարող եք "
 "փոխել ձեր գաղտնաբառը այստեղ` "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:106
 #, javascript-format
@@ -483,12 +731,21 @@ msgid ""
 "If you did not request this mail, please just ignore it (the ip that "
 "requested this mail was ${ ip })."
 msgstr ""
+<<<<<<< HEAD
+"Եթե ​​դուք չեք խնդրել այս նամակը, պարզապես անտեսեք այն (ip- ը, որը պահանջել է "
+"այս նամակը, ${ip} էր):"
+
+#: src/core/MailProvider.js:114
+msgid "Mail is not configured on the server"
+msgstr ""
+=======
 "Եթե դուք չեք պահանջել այս նամակը, խնդրում ենք պարզապես անտեսել այն (այս "
 "փոստը պահանջող IP-ն ${ ip } էր):"
 
 #: src/core/MailProvider.js:114
 msgid "Mail is not configured on the server"
 msgstr "Փոստը կազմաձևված չէ սերվերում"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:122
 msgid ""
@@ -496,7 +753,11 @@ msgid ""
 "another mail."
 msgstr ""
 "Մենք ձեզ արդեն նամակ ենք ուղարկել ՝ հրահանգներով: Խնդրում ենք սպասել, նախքան "
+<<<<<<< HEAD
+"մեկ այլ նամակ խնդրեք:"
+=======
 "մեկ այլ նամակ հայցելը:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:130
 msgid "Couldn't find this mail in our database"

i18n/ssr-it.po

@@ -96,6 +96,8 @@ msgstr "Password cambiata con successo"
 msgid "Invalid url :( Please check your mail again."
 msgstr "Url invalido :( Per favore controlla nuovamente la tua mail"
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun Globo 3D"
@@ -112,6 +114,7 @@ msgstr "Doppio click sul globo per andare indietro"
 msgid "Loading..."
 msgstr "Caricamento..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -120,6 +123,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun Globo 3D"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Un Globo 3D di tutta la nostra mappa"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Doppio click sul globo per andare indietro"
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Caricamento..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -234,6 +256,8 @@ msgstr "Solo gli admin possono farlo"
 msgid "Mail verification"
 msgstr "Verificazione mail"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Adesso sei verificato"
@@ -270,6 +294,7 @@ msgstr "Password incorretta"
 msgid "Muted Users can not delete their account."
 msgstr "Un account mutato non puo essere eliminato"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Il tuo email provider non è permesso, 1984"
@@ -323,6 +348,66 @@ msgstr "Fallimento nel creare un nuovo user"
 msgid "Failed to establish session after register :("
 msgstr "Fallimento nel ristabilire una sessione dopo la registraione"
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Verificazione mail"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Adesso sei verificato"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Il tuo mail verification code è invalido o è già scaduto ;(, per farvore "
+"richiedine uno nuovo"
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Non hai nemmeno fatto l'accesso"
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Errore del server durante il log out"
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Non sei autentificato"
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Password incorretta"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun Accounts"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Sarai rediretto automaticamente dopo 15s"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "o ${ clickHere } per tornare su pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Terra"
@@ -364,8 +449,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Il nostro canvas principale, una enorme mappa del mondo. Piazza onunque to "
 "voglia"
@@ -379,6 +468,13 @@ msgstr ""
 "che sia parte di un'art) o art più grande di 1.5kx1.5k pixel"
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Piazza Voxels sul canvas 3D con altri"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Piazza Voxels sul canvas 3D con altri"
@@ -386,6 +482,7 @@ msgstr "Piazza Voxels sul canvas 3D con altri"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Canvas speciale per sensibilizzare sul SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -409,16 +506,26 @@ msgstr ""
 "classifiche giornaliere riniziano a 00:00 UTC"
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Solo quattro colori, Stesse regole del moon canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+=======
 "earth canvas!"
 msgstr ""
 "Colonizza la terra in un canvas piu piccolo con l'oceano protetto. Il "
 "cooldown è lo stesso del canvas normale!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-ka.po

@@ -10,8 +10,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.4.2\n"
+=======
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:434
 #, fuzzy
@@ -23,6 +28,10 @@ msgid "Your country is temporary muted from this chat channel"
 msgstr "თქვენი ქვეყანა დამუდებული არის ამ ჩატიდან"
 
 #: src/core/ChatProvider.js:439
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "You are permanently muted, join our guilded to appeal the mute"
 msgstr ""
 "თქვენ სამუდამოდ დადუმებული ხართ, შემოუერთდით ჩვენს გილდიას, რათა გაასაჩივროთ "
@@ -89,6 +98,10 @@ msgid "User doesn't exist in our database :("
 msgstr "მომხმარებელი არ არსებობს ჩვენს მონაცემთა ბაზაში :("
 
 #: src/routes/reset_password.js:89
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "Password successfully changed."
 msgstr "პაროლი წარმატებით შეიცვალა."
 
@@ -96,6 +109,8 @@ msgstr "პაროლი წარმატებით შეიცვალ
 msgid "Invalid url :( Please check your mail again."
 msgstr "არასწორი url :( გთხოვთ, ხელახლა შეამოწმოთ თქვენი ფოსტა."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -112,6 +127,7 @@ msgstr "ორჯერ დააწკაპუნეთ გლობუსზ
 msgid "Loading..."
 msgstr "Ჩატვირთვა..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -120,6 +136,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobe"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "ჩვენი მთელი რუკის 3D გლობუსი"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "ორჯერ დააწკაპუნეთ გლობუსზე უკან დასაბრუნებლად."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Ჩატვირთვა..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -236,6 +271,8 @@ msgstr "ამის გაკეთება მხოლოდ ადმინ
 msgid "Mail verification"
 msgstr "ფოსტის გადამოწმება"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "ახლა დამოწმებული ხარ :)"
@@ -273,6 +310,7 @@ msgstr "Არასწორი პაროლი!"
 msgid "Muted Users can not delete their account."
 msgstr "დამიუთებულ მომხმარებლებს არ შეუძლიათ აქაუნთის წაშლა."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "ელფოსტის ეს პროვაიდერი დაუშვებელია"
@@ -327,6 +365,66 @@ msgstr "ახალი მომხმარებლის შექმნა
 msgid "Failed to establish session after register :("
 msgstr "რეგისტრაციის შემდეგ სესიის დამყარება ვერ მოხერხდა :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "ფოსტის გადამოწმება"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "ახლა დამოწმებული ხარ :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"თქვენი ფოსტის დამადასტურებელი კოდი არასწორია ან უკვე ვადაგასულია :(, გთხოვთ, "
+"მოითხოვოთ ახალი."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "თქვენ არც კი ხართ შესული."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "სერვერის შეცდომა გამოსვლისას."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "თქვენ არ ხართ დამოწმებული."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Არასწორი პაროლი!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun ანგარიშები"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "თქვენ ავტომატურად გადამისამართდებით 15 წამის შემდეგ"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "ან ${ clickHere } pixelplanet-ზე დასაბრუნებლად"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "დედამიწა"
@@ -361,6 +459,16 @@ msgstr "10 საუკეთესო"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 msgstr "2-ბითი"
 
 #: src/canvasesDesc.js:29
@@ -370,6 +478,7 @@ msgstr "მინირუკა"
 #: src/canvasesDesc.js:32
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "ჩვენი მთავარი კანვასი, მსოფლიოს უზარმაზარი რუკა. განათავსეთ ყველგან, სადაც "
 "გსურთ"
@@ -384,6 +493,13 @@ msgstr ""
 "ნამუშევარი."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "მოათავსეთ ვოქსელები 3D ტილოზე სხვებთან ერთად"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "მოათავსეთ ვოქსელები 3D ტილოზე სხვებთან ერთად"
@@ -391,6 +507,7 @@ msgstr "მოათავსეთ ვოქსელები 3D ტილო
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "სპეციალური ტილო SARS-CoV2-ის შესახებ ცნობადობის გასავრცელებლად"
 
 #: src/canvasesDesc.js:36
@@ -414,6 +531,19 @@ msgstr ""
 "განახლებები 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+
+#: src/canvasesDesc.js:41
+msgid ""
+"Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+"earth canvas."
+msgstr ""
+
+#: src/core/MailProvider.js:66
+#, fuzzy, javascript-format
+=======
 #, fuzzy
 msgid "Only four colors. Same rules as moon!"
 msgstr "მარტო 4 ფერი. იგივე წესები რაც მთვარეზეა."
@@ -429,6 +559,7 @@ msgstr ""
 
 #: src/core/MailProvider.js:66
 #, javascript-format
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
 msgstr ""
 "მოგესალმებით ${ name } PixelPlanet-ში, გთხოვთ, გადაამოწმოთ თქვენი ფოსტა"
@@ -456,6 +587,7 @@ msgid "Or by copying following url:"
 msgstr "ან შემდეგი url-ის კოპირებით:"
 
 #: src/core/MailProvider.js:69
+#, fuzzy
 msgid ""
 "Have fun and don't hesitate to contact us if you encounter any problems :)"
 msgstr ""

i18n/ssr-kk.po

@@ -95,6 +95,8 @@ msgstr "Құпиясөз сәтті өзгертілді."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Жарамсыз URL :( Эл. поштаңызды қайта тексеріңіз."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D-глобусы"
@@ -111,6 +113,7 @@ msgstr "Оралу үшін глобусқа екі рет басыңыз."
 msgid "Loading..."
 msgstr "Жүктелуде..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -119,6 +122,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun қалқымалы терезесі"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3D-глобусы"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Бүкіл картамыздың 3D-глобусы"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Оралу үшін глобусқа екі рет басыңыз."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Жүктелуде..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -235,6 +257,8 @@ msgstr "Мына әрекетті әкімшілер ғана жасай ала
 msgid "Mail verification"
 msgstr "Эл. пошта растау"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Енді сіз расталғансыз :)"
@@ -271,6 +295,7 @@ msgstr "Құпиясөз дұрыс емес!"
 msgid "Muted Users can not delete their account."
 msgstr ""
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Осы эл. пошта сервисіне тыйым салынған"
@@ -324,6 +349,66 @@ msgstr "Жаңа тіркелгі жасау мүмкін емес :("
 msgid "Failed to establish session after register :("
 msgstr "Тіркелуден кейінгі сессияны орнату мүмкін емес :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Эл. пошта растау"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Енді сіз расталғансыз :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Эл. пошта растау кодыңыз жарамсыз немесе оның мерзімі өтіп кетті :(, жаңа "
+"растау кодын сұратыңыз."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Сіз тіпті жүйеге кірмедіңіз."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Жүйеден шыққанда сервер қатесі орын алды."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Аутентификациядан өтпедіңіз."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Құпиясөз дұрыс емес!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun тіркелгілері"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "15 секундтан кейін сізді автоматты түрде қайта бағдарлаймыз"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Немесе pixelplanet-ке оралу үшін ${ clickHere }"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Жер"
@@ -365,8 +450,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Басты кенебіміз, үлкен әлем картасы. Кез келген жерде сурет салыңыз"
 
 #: src/canvasesDesc.js:33
@@ -379,6 +468,13 @@ msgstr ""
 "болмайды."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Басқалармен бірге вокселдерді 3D-кенепке салыңыз"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Басқалармен бірге вокселдерді 3D-кенепке салыңыз"
@@ -386,6 +482,7 @@ msgstr "Басқалармен бірге вокселдерді 3D-кенепк
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "SARS-CoV2 туралы хабардарлықты арттыруға арналған арнайы кенеп"
 
 #: src/canvasesDesc.js:36
@@ -409,13 +506,21 @@ msgstr ""
 "бойынша түн ортасында арылтады."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-nl.po

@@ -98,6 +98,8 @@ msgstr "Wachtwoord succesvol veranderd."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Ongeldige url :( Controleer a.u.b. nogmaals uw mail."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -114,6 +116,7 @@ msgstr "Dubbelklik op wereldbol om terug te gaan."
 msgid "Loading..."
 msgstr "Laden…"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -122,6 +125,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun-pop-up"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobe"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Een 3D-wereldbol van onze hele kaart"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Dubbelklik op wereldbol om terug te gaan."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Laden…"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -234,6 +256,11 @@ msgstr "U heeft geen toegang tot deze pagina"
 msgid "Just admins can do that"
 msgstr "Alleen beheerders kunnen dat doen"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Je bent niet gebanned"
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "E-mail verificatie"
@@ -272,6 +299,7 @@ msgstr "Onjuist wachtwoord!"
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
 msgstr ""
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
@@ -326,6 +354,65 @@ msgstr "Kan nieuwe gebruiker niet aanmaken :("
 msgid "Failed to establish session after register :("
 msgstr "Kan sessie niet tot stand brengen na registratie :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "E-mail verificatie"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Je bent nu geverifieerd :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Uw e-mailverificatiecode is ongeldig of al verlopen :(, vraag een nieuwe aan."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Je bent niet eens ingelogd."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Serverfout bij uitloggen."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "U bent niet geauthenticeerd."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Onjuist wachtwoord!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "PixelPlanet.fun-accounts"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Na 15 seconden wordt u automatisch doorgestuurd"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Of ${ clickHere } om terug te gaan naar pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Aarde"
@@ -367,8 +454,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Ons belangrijkste canvas, een enorme kaart van de wereld. Plaats waar je "
 "maar wilt"
@@ -382,6 +473,13 @@ msgstr ""
 "onderdeel van kunst) of kunst groter dan 1,5k x 1,5k pixels."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Plaats Voxels samen met anderen op een 3D-canvas"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Plaats Voxels samen met anderen op een 3D-canvas"
@@ -389,6 +487,7 @@ msgstr "Plaats Voxels samen met anderen op een 3D-canvas"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Speciaal canvas om het bewustzijn van SARS-CoV2 te vergroten"
 
 #: src/canvasesDesc.js:36
@@ -412,13 +511,21 @@ msgstr ""
 "ranking-updates om 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-os.po

@@ -13,8 +13,12 @@ msgstr ""
 "X-Generator: Poedit 2.4.3\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+=======
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Нæй гæнæн фыстæджы чат арвит пиксел фæрцы"
 
 #: src/core/ChatProvider.js:436
@@ -95,10 +99,26 @@ msgstr "Парол æнтыстджынæй ивыдзинад."
 msgid "Invalid url :( Please check your mail again."
 msgstr "URL æнæраст :( табуафси посты рабæлвырд иу хатт ма."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.fun"
+
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun Æртæбаргæ глобус"
 
+=======
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun Æртæбаргæ глобус"
+
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:38
 msgid "A 3D globe of our whole map"
 msgstr "Æртæбаргæ глобус алцы нæ картæ"
@@ -111,6 +131,8 @@ msgstr "Дыууæ хатты глобусы ныкъкъæрцц, цæмæй р
 msgid "Loading..."
 msgstr "Æрбавгæд..."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -120,6 +142,7 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
@@ -216,11 +239,14 @@ msgstr "Ног Паролы Сфидар"
 msgid "Submit"
 msgstr "Сфидар кæн"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
 msgstr "Дæ аутентификацийы нæй."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 #, fuzzy
 msgid "You are not logged in"
@@ -235,6 +261,51 @@ msgstr "Нæй гæнæн бацæуæн къаналмæ ай"
 msgid "Just admins can do that"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Дæ аутентификацийы нæй."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Captcha тексты æнæ бацамон"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Електронон адрис æрцахс нырид."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Пайдагæнæджы ном æрцахс нырид."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Бахардз дæ æгæр бирæ рæстæг, бафæлвар иу хатт ма."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Дæ Captcha фæкъуыхцы у"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Æнæзонгæ Captcha Рæдыд"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Ног пайдагæнæг сфæлдис æнæ бантыc :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Сеансы равæр регистраци стæй æнæ бантыс :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Посты басгæрст"
@@ -271,6 +342,13 @@ msgid "Incorrect password!"
 msgstr "Æнæраст парол!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -280,6 +358,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -295,6 +374,8 @@ msgstr "Æгъгъæд дæ автоматы здæхтдзинад 15 сикъ
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Кæнæ ${ clickHere } pixelplanet'мæ раздæх"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 #, fuzzy
 msgid "No Captcha given"
@@ -328,6 +409,7 @@ msgstr "Ног пайдагæнæг сфæлдис æнæ бантыc :("
 msgid "Failed to establish session after register :("
 msgstr "Сеансы равæр регистраци стæй æнæ бантыс :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Зæхх"
@@ -369,8 +451,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Нæ сæйраг четæн, тынг стыр дунейы картæ. Бынат алкæм, кæм зæрдæдмæ цæуы дæ"
 
@@ -383,6 +469,13 @@ msgstr ""
 "иллиустраци) кæнæ иллиустрацийы бæрц 1,5 х 1,5 пикселы миндæр."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Вокселы æрбынат 3D четæны иумæ иннæмæ"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Вокселы æрбынат 3D четæны иумæ иннæмæ"
@@ -390,6 +483,7 @@ msgstr "Вокселы æрбынат 3D четæны иумæ иннæмæ"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Сæрмагонд четæн ахæлиуæн информацыл SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -411,13 +505,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-pt.po

@@ -2,6 +2,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.4.2\n"
+
+#: src/core/ChatProvider.js:434
+msgid "You can not send chat messages with proxy"
+msgstr "Você não pode enviar mensagens no bate-papo com um proxy"
+
+#: src/core/ChatProvider.js:436
+#, fuzzy
+msgid "Your country is temporary muted from this chat channel"
+msgstr "Seu país está silenciado temporariamente no bate-papo"
+=======
 "PO-Revision-Date: 2024-03-10 16:43+0000\n"
 "Last-Translator: Justportuguese <joaomlribeiro888@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/pixelplanet/"
@@ -21,6 +41,7 @@ msgstr "Você não pode enviar mensagens no bate-papo com um proxy"
 #: src/core/ChatProvider.js:436
 msgid "Your country is temporary muted from this chat channel"
 msgstr "Seu país está silenciado temporariamente neste bate-papo"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:439
 msgid "You are permanently muted, join our guilded to appeal the mute"
@@ -29,12 +50,22 @@ msgstr ""
 "recurso sobre seu silenciamento"
 
 #: src/core/ChatProvider.js:441
+<<<<<<< HEAD
+#, fuzzy
+msgid "You are banned"
+msgstr "Você não está autenticado."
+
+#: src/core/ChatProvider.js:443
+msgid "Your Internet Provider is banned"
+msgstr ""
+=======
 msgid "You are banned"
 msgstr "Você está banido"
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
 msgstr "O seu provedor de internet está banido"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
@@ -42,7 +73,11 @@ msgid "You are muted for another ${ timeMin } minutes"
 msgstr "Você está silenciado por mais ${ timeMin } minutos"
 
 #: src/core/ChatProvider.js:450
+<<<<<<< HEAD
+#, fuzzy, javascript-format
+=======
 #, javascript-format
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "You are muted for another ${ ttl } seconds"
 msgstr "Você está silenciado por mais ${ ttl } segundos"
 
@@ -97,6 +132,8 @@ msgstr "Senha trocada com sucesso."
 msgid "Invalid url :( Please check your mail again."
 msgstr "URL inválido :( Por favor, olhe seu email de novo."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun Globo3D"
@@ -113,6 +150,7 @@ msgstr "Clique duas vezes no globo para voltar."
 msgid "Loading..."
 msgstr "Carregando..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -122,6 +160,25 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun Globo3D"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Um globo 3D do nosso mapa"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Clique duas vezes no globo para voltar."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Carregando..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
@@ -135,7 +192,11 @@ msgstr ""
 
 #: src/utils/validation.js:17
 msgid "Email can't be empty."
+<<<<<<< HEAD
+msgstr "E-mail não pode ser vazio."
+=======
 msgstr "E-mail não pode estar vazio."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
@@ -147,6 +208,17 @@ msgstr "E-mail não pode ser maior que 40 caracteres."
 
 #: src/utils/validation.js:20
 msgid "Email should at least contain a dot"
+<<<<<<< HEAD
+msgstr "E-mail deve conter pelo menos um ponto"
+
+#: src/utils/validation.js:22
+msgid "Email should contain a @"
+msgstr "E-mail deve conter um @"
+
+#: src/utils/validation.js:29
+msgid "Name can't be empty."
+msgstr "Nome não pode ser vazio."
+=======
 msgstr "E-mail deve ter pelo menos um ponto"
 
 #: src/utils/validation.js:22
@@ -156,6 +228,7 @@ msgstr "E-mail deve ter um @"
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
 msgstr "Nome não pode estar vazio."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:30
 #, fuzzy
@@ -168,7 +241,11 @@ msgstr "Nome deve ser menor que 26 caracteres"
 
 #: src/utils/validation.js:38
 msgid "Name contains invalid character like @, /, \\ or #"
+<<<<<<< HEAD
+msgstr "Nome contém caractere invalido como @, /, \\ ou #"
+=======
 msgstr "Nome contem caractere invalido como @,/,\\ ou #"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:53
 msgid "No password given."
@@ -176,11 +253,19 @@ msgstr "Nenhuma senha fornecida."
 
 #: src/utils/validation.js:56
 msgid "Password must be at least 6 characters long."
+<<<<<<< HEAD
+msgstr "Senha deve ter ao menos 6 caracteres."
+
+#: src/utils/validation.js:59
+msgid "Password must be shorter than 60 characters."
+msgstr "Senha deve ser menor que 60 caracteres."
+=======
 msgstr "A senha deve ter ao menos 6 caracteres."
 
 #: src/utils/validation.js:59
 msgid "Password must be shorter than 60 characters."
 msgstr "A senha deve ser menor que 60 caracteres."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
 msgid "PixelPlanet.fun Password Reset"
@@ -218,12 +303,16 @@ msgstr "Confirme a senha nova"
 
 #: src/ssr/PasswordReset.jsx:65
 msgid "Submit"
+<<<<<<< HEAD
+msgstr "Envie"
+=======
 msgstr "Enviar"
 
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
 msgstr "Você não está autenticado."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/modtools.js:53
 #, fuzzy
@@ -239,6 +328,51 @@ msgstr "Você não tem acesso a esse canal"
 msgid "Just admins can do that"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Você não está autenticado."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Nenhuma senha fornecida."
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-Mail já está em uso."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Nome de usuário já em uso."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr ""
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr ""
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr ""
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Falhei ao criar novo usuário :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Falhei ao estabelecer sessão após registrar :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Verificação de e-mail"
@@ -276,6 +410,13 @@ msgid "Incorrect password!"
 msgstr "Senha errada!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -285,6 +426,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -300,6 +442,8 @@ msgstr "Você vai ser redirecionado automaticamente em 15 segundos"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Ou ${ clickHere } para voltar ao pixelplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 #, fuzzy
 msgid "No Captcha given"
@@ -333,6 +477,7 @@ msgstr "Falhei ao criar novo usuário :("
 msgid "Failed to establish session after register :("
 msgstr "Falhei ao estabelecer sessão após registrar :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Terra"
@@ -374,8 +519,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Nosso canvas principal, um mapa gigante da Terra. Coloque píxeis onde você "
 "quiser"
@@ -390,6 +539,13 @@ msgstr ""
 "não ser que faça parte da arte)"
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Coloque cubos em um canvas 3D com outras pessoas."
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Coloque cubos em um canvas 3D com outras pessoas."
@@ -397,6 +553,7 @@ msgstr "Coloque cubos em um canvas 3D com outras pessoas."
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Canvas especial para conscientizar sobre o SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -418,13 +575,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-ro.po

@@ -15,6 +15,84 @@ msgstr ""
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+msgstr ""
+
+#: src/core/ChatProvider.js:436
+msgid "Your country is temporary muted from this chat channel"
+msgstr ""
+
+#: src/core/ChatProvider.js:439
+msgid "You are permanently muted, join our guilded to appeal the mute"
+msgstr ""
+
+#: src/core/ChatProvider.js:441
+#, fuzzy
+msgid "You are banned"
+msgstr "Ești ciudat"
+
+#: src/core/ChatProvider.js:443
+#, fuzzy
+msgid "Your Internet Provider is banned"
+msgstr "Furnizorul tău de internet este interzis din a juca acest joc"
+
+#: src/core/ChatProvider.js:448
+#, javascript-format
+msgid "You are muted for another ${ timeMin } minutes"
+msgstr ""
+
+#: src/core/ChatProvider.js:450
+#, javascript-format
+msgid "You are muted for another ${ ttl } seconds"
+msgstr ""
+
+#: src/core/ChatProvider.js:467
+#, javascript-format
+msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
+msgstr ""
+
+#: src/core/ChatProvider.js:471
+msgid "You don't have access to this channel"
+msgstr ""
+
+#: src/core/ChatProvider.js:490
+#, fuzzy
+msgid "Your mail has to be verified in order to chat"
+msgstr "Trebuie să fi logat pentru a vorbi"
+
+#: src/core/ChatProvider.js:500
+msgid "You can't send a message this long :("
+msgstr ""
+
+#: src/core/ChatProvider.js:504
+msgid "Please use int channel"
+msgstr ""
+
+#: src/core/ChatProvider.js:512
+msgid "Stop flooding."
+msgstr ""
+
+#: src/routes/reset_password.js:39
+msgid "You sent an empty password or invalid data :("
+msgstr ""
+
+#: src/routes/reset_password.js:51
+msgid "This password-reset link isn't valid anymore :("
+msgstr ""
+
+#: src/routes/reset_password.js:62
+#, fuzzy
+msgid "Your passwords do not match :("
+msgstr "Parolele nu sunt aceleași."
+
+#: src/routes/reset_password.js:77
+msgid "User doesn't exist in our database :("
+msgstr ""
+
+#: src/routes/reset_password.js:89
+#, fuzzy
+=======
 msgid "You can not send chat messages while using a proxy"
 msgstr "Nu poți trimite mesaje în chat folosind proxy"
 
@@ -86,11 +164,35 @@ msgid "User doesn't exist in our database :("
 msgstr "Utilizatorul nu există în datele noastre de bază :("
 
 #: src/routes/reset_password.js:89
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "Password successfully changed."
 msgstr "Schimbat parola cu success."
 
 #: src/routes/reset_password.js:108
 msgid "Invalid url :( Please check your mail again."
+<<<<<<< HEAD
+msgstr ""
+
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+msgid "PixelPlanet.Fun PopUp"
+msgstr ""
+
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr ""
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr ""
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr ""
+=======
 msgstr "Url invalid :( Te rog verifică mailul din nou."
 
 #: src/ssr/Globe.jsx:37
@@ -104,11 +206,22 @@ msgstr "Un glob 3D despre toată harta"
 #: src/ssr/Globe.jsx:51
 msgid "Double click on globe to go back."
 msgstr "Apasă de două ori globul pentru a merge înapoi."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/Globe.jsx:52
 msgid "Loading..."
 msgstr "Se încarcă..."
 
+<<<<<<< HEAD
+#: src/ssr/Main.jsx:65
+msgid "PixelPlanet.Fun"
+msgstr ""
+
+#: src/ssr/Main.jsx:66
+#, fuzzy
+msgid "Place color pixels on an map styled canvas with other players online"
+msgstr "Pune pixeli colorați pe un canvas mare cu alți jucători online!"
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -125,6 +238,7 @@ msgstr "PixelPlanet.Fun"
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Pune pixeli de culoare pe un Convas în stil hartă cu alți jucători online"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:17
 msgid "Email can't be empty."
@@ -176,6 +290,28 @@ msgstr "Parola trebuie să aibă mai puțin de 60 de litere."
 
 #: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
 msgid "PixelPlanet.fun Password Reset"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/ssr/PasswordReset.jsx:21 src/ssr/PasswordReset.jsx:41
+msgid "Reset your password here"
+msgstr ""
+
+#: src/core/MailProvider.js:105 src/ssr/PasswordReset.jsx:28
+#: src/ssr/PasswordReset.jsx:49
+#, fuzzy
+msgid "Reset Password"
+msgstr "Parola Nouă"
+
+#: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
+#, fuzzy
+msgid "Click here"
+msgstr "Vorbește aici"
+
+#: src/ssr/PasswordReset.jsx:30
+msgid "to go back to pixelplanet"
+msgstr ""
+=======
 msgstr "PixelPlanet.fun Resetare Parolă"
 
 #: src/ssr/PasswordReset.jsx:21 src/ssr/PasswordReset.jsx:41
@@ -194,11 +330,16 @@ msgstr "Apasă aici"
 #: src/ssr/PasswordReset.jsx:30
 msgid "to go back to pixelplanet"
 msgstr "Pentru a merge înapoi pe pixelplanet"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/PasswordReset.jsx:50
 #, javascript-format
 msgid "Hello ${ name }, you can set your new password here:"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Bună ${ name }, poți să-ți setezi o parolă nouă aici:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/PasswordReset.jsx:54
 msgid "New Password"
@@ -211,6 +352,377 @@ msgstr "Confirmă Parola Nouă"
 #: src/ssr/PasswordReset.jsx:65
 msgid "Submit"
 msgstr "Încarcă"
+<<<<<<< HEAD
+
+#: src/routes/api/modtools.js:53
+#, fuzzy
+msgid "You are not logged in"
+msgstr "Nu ai niciun utilizator blocat"
+
+#: src/routes/api/modtools.js:65
+#, fuzzy
+msgid "You are not allowed to access this page"
+msgstr "Trebuie să fii logat pentru a pune pe acest canvas"
+
+#: src/routes/api/modtools.js:207
+msgid "Just admins can do that"
+msgstr ""
+
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Ești ciudat"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Niciun id captcha primit"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr ""
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr ""
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Ți-a luat prea mult, încearcă din nou."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Nu ai trecut captchaul tău"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Eroare de Captcha necunoscută"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr ""
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr ""
+
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr ""
+
+#: src/routes/api/auth/verify.js:27
+#, fuzzy
+msgid "You are now verified :)"
+msgstr "Ești ciudat"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+
+#: src/routes/api/auth/logout.js:11
+#, fuzzy
+msgid "You are not even logged in."
+msgstr "Nu ai niciun utilizator blocat"
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+#, fuzzy
+msgid "Incorrect password!"
+msgstr "Uitat Parola"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+#, fuzzy
+msgid "PixelPlanet.fun Accounts"
+msgstr "Șterge Contul"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr ""
+
+#: src/canvasesDesc.js:20
+msgid "Earth"
+msgstr ""
+
+#: src/canvasesDesc.js:21
+msgid "Moon"
+msgstr ""
+
+#: src/canvasesDesc.js:22
+#, fuzzy
+msgid "3D Canvas"
+msgstr "Canvas"
+
+#: src/canvasesDesc.js:23
+msgid "Coronavirus"
+msgstr ""
+
+#: src/canvasesDesc.js:24
+msgid "PixelZone"
+msgstr ""
+
+#: src/canvasesDesc.js:25
+#, fuzzy
+msgid "PixelCanvas"
+msgstr "Canvas"
+
+#: src/canvasesDesc.js:26
+msgid "1bit"
+msgstr ""
+
+#: src/canvasesDesc.js:27
+msgid "Top10"
+msgstr ""
+
+#: src/canvasesDesc.js:28
+msgid "2bit"
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr ""
+
+#: src/canvasesDesc.js:33
+msgid ""
+"Moon canvas. Safe space for art. No flags or large text (unless part of art) "
+"or art larger than 1.5k x 1.5k pixels."
+msgstr ""
+
+#: src/canvasesDesc.js:34
+#, fuzzy
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Pune pixeli colorați pe un canvas mare cu alți jucători online!"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr ""
+
+#: src/canvasesDesc.js:36
+msgid "Mirror of PixelZone"
+msgstr ""
+
+#: src/canvasesDesc.js:37
+msgid "Mirror of PixelCanvas"
+msgstr ""
+
+#: src/canvasesDesc.js:38
+msgid "Black and White canvas"
+msgstr ""
+
+#: src/canvasesDesc.js:39
+msgid ""
+"A canvas for the most active players from the the previous day. Daily "
+"ranking updates at 00:00 UTC."
+msgstr ""
+
+#: src/canvasesDesc.js:40
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+
+#: src/canvasesDesc.js:41
+msgid ""
+"Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+"earth canvas."
+msgstr ""
+
+#: src/core/MailProvider.js:66
+#, javascript-format
+msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
+msgstr ""
+
+#: src/core/MailProvider.js:67
+#, javascript-format
+msgid "Hello ${ name }"
+msgstr ""
+
+#: src/core/MailProvider.js:68
+msgid ""
+"welcome to our little community of pixelplacers, to use your account, you "
+"have to verify your mail. You can do that here: "
+msgstr ""
+
+#: src/core/MailProvider.js:68
+msgid "Click to Verify"
+msgstr ""
+
+#: src/core/MailProvider.js:68 src/core/MailProvider.js:105
+msgid "Or by copying following url:"
+msgstr ""
+
+#: src/core/MailProvider.js:69
+msgid ""
+"Have fun and don't hesitate to contact us if you encounter any problems :)"
+msgstr ""
+
+#: src/core/MailProvider.js:70 src/core/MailProvider.js:107
+msgid "Thanks"
+msgstr ""
+
+#: src/core/MailProvider.js:87
+#, javascript-format
+msgid ""
+"We already sent you a verification mail, you can request another one in "
+"${ minLeft } minutes."
+msgstr ""
+
+#: src/core/MailProvider.js:103
+msgid "You forgot your password for PixelPlanet? Get a new one here"
+msgstr ""
+
+#: src/core/MailProvider.js:104
+msgid "Hello"
+msgstr ""
+
+#: src/core/MailProvider.js:105
+msgid ""
+"You requested to get a new password. You can change your password within the "
+"next 30min here: "
+msgstr ""
+
+#: src/core/MailProvider.js:106
+#, javascript-format
+msgid ""
+"If you did not request this mail, please just ignore it (the ip that "
+"requested this mail was ${ ip })."
+msgstr ""
+
+#: src/core/MailProvider.js:114
+msgid "Mail is not configured on the server"
+msgstr ""
+
+#: src/core/MailProvider.js:122
+#, fuzzy
+msgid ""
+"We already sent you a mail with instructions. Please wait before requesting "
+"another mail."
+msgstr "Ți-am trimis un mail cu instrucțiuni ca să îți resetezi parola."
+
+#: src/core/MailProvider.js:130
+msgid "Couldn't find this mail in our database"
+msgstr ""
+
+#, javascript-format
+#~ msgid "Switched to ${ canvasName }"
+#~ msgstr "Schimbat canvasul la ${ canvasName }"
+
+#~ msgid "Grid ON"
+#~ msgstr "Grilă Pornită"
+
+#~ msgid "Grid OFF"
+#~ msgstr "Grilă Oprită"
+
+#~ msgid "Pixel Notify ON"
+#~ msgstr "Notificare Pixeli Pornită"
+
+#~ msgid "Pixel Notify OFF"
+#~ msgstr "Notificare Pixeli Oprită"
+
+#~ msgid "Muted Sound"
+#~ msgstr "Sunet Oprit"
+
+#~ msgid "Unmuted Sound"
+#~ msgstr "Sunet Pornit"
+
+#~ msgid "Copied!"
+#~ msgstr "Copiat!"
+
+#~ msgid "Show Hidden Canvases"
+#~ msgstr "Arată Canvasurile Ascunse"
+
+#~ msgid "Hide Hidden Canvases"
+#~ msgstr "Ascunde Canvasurile Ascunse"
+
+#~ msgid "Error :("
+#~ msgstr "Eroare :("
+
+#~ msgid "Didn't get an answer from pixelplanet. Maybe try to refresh?"
+#~ msgstr ""
+#~ "Nu am primit niciun răspuns de la pixelplanet. Poate încearcă să "
+#~ "reîncarci pagina?"
+
+#~ msgid "Invalid Canvas"
+#~ msgstr "Canvas Invalid"
+
+#~ msgid "This canvas doesn't exist"
+#~ msgstr "Acest Canvas nu există."
+
+#~ msgid "Invalid Coordinates"
+#~ msgstr "Coordonate invalide"
+
+#~ msgid "x out of bounds"
+#~ msgstr "x în afara limitelor"
+
+#~ msgid "y out of bounds"
+#~ msgstr "y în afara limitelor"
+
+#~ msgid "z out of bounds"
+#~ msgstr "z în afara limitelor"
+
+#~ msgid "Wrong Color"
+#~ msgstr "Culoarea greșită"
+
+#~ msgid "Invalid color selected"
+#~ msgstr "Culoare invalidă selectată"
+
+#~ msgid "Just for registered Users"
+#~ msgstr "Doar pentru Utilizatorii înregistrați"
+
+#~ msgid "Place more :)"
+#~ msgstr "Pune mai mult :)"
+
+#~ msgid "You can not access this canvas yet. You need to place more pixels"
+#~ msgstr ""
+#~ "Momentan nu poți accesa acest canvas. Trebuie să pui mai mulți pixeli"
+
+#~ msgid "Pixel protected!"
+#~ msgstr "Pixel protejat!"
+
+#~ msgid "Please prove that you are human"
+#~ msgstr "Te rog să dovedești că ești om"
+
+#~ msgid "No Proxies Allowed :("
+#~ msgstr "Proxiurile nu sunt permise :("
+
+#~ msgid "You are using a Proxy."
+#~ msgstr "Tu folosești un Proxy."
+
+#~ msgid "Not allowed"
+#~ msgstr "Nu este permis"
+
+=======
 
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
@@ -588,6 +1100,7 @@ msgstr "Nu am putut găsi acest mail în datele noastre de bază"
 #~ msgid "Not allowed"
 #~ msgstr "Nu este permis"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #~ msgid "Just the Top10 of yesterday can place here"
 #~ msgstr "Doar cei din Top10 ieri pot pune aici"
 

i18n/ssr-ru.po

@@ -2,7 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2024-03-09 11:55+0000\n"
+=======
 "PO-Revision-Date: 2024-04-02 18:53+0000\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Last-Translator: sallbet <Sallbet@mail.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/ru/>\n"
@@ -95,6 +99,8 @@ msgstr "Пароль успешно изменен."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Неверный адрес :( Пожалуйста, проверьте свою почту еще раз."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3D-глобус"
@@ -111,6 +117,7 @@ msgstr "Дважды щелкните по глобусу, чтобы верну
 msgid "Loading..."
 msgstr "Загрузка..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -119,6 +126,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "Всплывающее окно PixelPlanet.Fun"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3D-глобус"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "3D-глобус всей нашей карты"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Дважды щелкните по глобусу, чтобы вернуться."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Загрузка..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -234,6 +260,8 @@ msgstr "Это могут сделать только админы"
 msgid "Mail verification"
 msgstr "Подтверждение почты"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "Вы прошли проверку :)"
@@ -270,6 +298,7 @@ msgstr "Неверный пароль!"
 msgid "Muted Users can not delete their account."
 msgstr "Пользователи в муте не могут удалить свой аккаунт."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
 msgstr "Этот провайдер электронной почты не разрешен"
@@ -323,6 +352,66 @@ msgstr "Не удалось создать нового пользователя
 msgid "Failed to establish session after register :("
 msgstr "Не удалось установить сеанс после регистрации :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Подтверждение почты"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Вы прошли проверку :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Ваш код проверки почты недействителен или срок его действия уже истек :(, "
+"запросите новый."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Вы даже не вошли в систему."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Ошибка сервера при выходе из аккаунта."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Вы не авторизованы."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Неверный пароль!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr "Пользователи в муте не могут удалить свой аккаунт."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr "Пользователи в муте не могут это сделать."
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "Аккаунты PixelPlanet.fun"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Вы будете автоматически перенаправлены через 15 секунд"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Или ${clickHere}, чтобы вернуться на pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Земля"
@@ -364,7 +453,11 @@ msgid "Minimap"
 msgstr "Миникарта"
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Наше главное полотно - огромная карта мира, вы можете ставить пиксели где "
 "хотите!"
@@ -379,6 +472,14 @@ msgstr ""
 "х 1,5 тысячи пикселей."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Размещайте воксели на 3D полотне вместе с другими игроками"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Специальное полотно для распространения осведомленности о SARS-CoV2"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Размещайте воксели на 3D полотне вместе с другими игроками."
 
@@ -387,6 +488,7 @@ msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr ""
 "Специальное полотно для распространения осведомленности о SARS-CoV2 "
 "(вакцинируйтесь)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -409,16 +511,28 @@ msgstr ""
 "рейтинга в 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr "Только четыре цвета. Правила такие же как и на луне."
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Только четыре цвета. Правила такие же как и на полотне луны!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+"Завоевывайте земли на меньшем полотне земли с океаном под защитой. Время "
+"восстановления связано с земным полотном."
+=======
 "earth canvas!"
 msgstr ""
 "Завоевывайте земли на меньшем полотне земли с океаном под защитой. Время "
 "восстановления связано с земным полотном!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-sc.po

@@ -94,6 +94,8 @@ msgstr "Password canciata."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Url mmaliru,piffauri talia l'email arre..."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -110,6 +112,7 @@ msgstr "Ammacca rui voti nalu globo pi iri in arre."
 msgid "Loading..."
 msgstr "Caricannu..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -118,6 +121,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PopUp ri PixelPlanet.Fun"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobe"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "U globo 3d ri tutta a mappa"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Ammacca rui voti nalu globo pi iri in arre."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Caricannu..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -229,6 +251,11 @@ msgstr "Unna u pirmissu pi trasiri intra sta pagina"
 msgid "Just admins can do that"
 msgstr "Sulu li admin ponnu fari chistu"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Unsi bannatu"
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Verifica pi email"
@@ -268,6 +295,7 @@ msgstr "Password sbagliata!"
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
 msgstr ""
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
@@ -322,6 +350,66 @@ msgstr "Falli a criari un novu utenti"
 msgid "Failed to establish session after register :("
 msgstr "Falli a fari na sissiuni ropu a registazioni :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Verifica pi email"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Si verificatu"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"U To codici pi verificarti j'e mmalidu o scarutu ;(, piffauri richiedi "
+"navutru."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Unsi mancu loggatu."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Erruri rilu server quannu loggasti fora."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "Unsi autenticatu."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "Password sbagliata!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "Account ri PixelPlanet.fun"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "Veni mannatu nala paggina automaticamente 'n 15s"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "O ${ clickHere } Pi gghiri arre su pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Terra"
@@ -363,8 +451,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "U Canvas principali, na mappa ranni ri tuttu u munnu. Piazza unne ghie ca ti "
 "piaci"
@@ -379,6 +471,13 @@ msgstr ""
 "pixels."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Piazza Voxels intra 'n canvas 3D cu l'avutri"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Piazza Voxels intra 'n canvas 3D cu l'avutri"
@@ -386,6 +485,7 @@ msgstr "Piazza Voxels intra 'n canvas 3D cu l'avutri"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Canvas spiciali pi diffunniri a consapevolizza sulu SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -408,13 +508,21 @@ msgstr ""
 "U canvas sulu pili iucatura chiu attiva d'aeri. Aggiurnamenti a 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-sl.po

@@ -14,8 +14,12 @@ msgstr ""
 "X-Generator: Poedit 2.4.2\n"
 
 #: src/core/ChatProvider.js:434
+<<<<<<< HEAD
+msgid "You can not send chat messages with proxy"
+=======
 #, fuzzy
 msgid "You can not send chat messages while using a proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Ne morate pošiljati sporočil za proksiji"
 
 #: src/core/ChatProvider.js:436
@@ -96,6 +100,18 @@ msgstr "Geslo je bilo uspešno spremenjeno."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Neveljavna povezava :( Prosim ponovno preverite vaš E-naslov."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.fun"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobus"
@@ -112,6 +128,13 @@ msgstr "Kliknite dvakrat na planet, da se vrnete"
 msgid "Loading..."
 msgstr "Nalaganje..."
 
+<<<<<<< HEAD
+#: src/ssr/Main.jsx:65
+#, fuzzy
+msgid "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
+
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -126,6 +149,7 @@ msgstr "PixelPlanet.fun"
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
@@ -219,11 +243,14 @@ msgstr "Potrdite Novo Geslo"
 msgid "Submit"
 msgstr "Oddajte"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
 msgstr "Niste preverjeni."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/modtools.js:53
 #, fuzzy
 msgid "You are not logged in"
@@ -238,6 +265,51 @@ msgstr "Nimate dostopa do tega kanala"
 msgid "Just admins can do that"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+#, fuzzy
+msgid "You are not banned"
+msgstr "Niste preverjeni."
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+#, fuzzy
+msgid "No Captcha given"
+msgstr "Niste vnesli besedila za captcho"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-Naslov je že v uporabi."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Uporabniško ime je že v uporabi"
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Potrebovali ste preveč časa poizkušajte ponovno."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Ni vam uspelo narediti captcho"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Neznana Napaka Captche"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Ni nam uspelo ustvariti novega uporabnika :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Ni nam uspelo ustvariti seje po registraciji :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Potrjevanje E-naslova"
@@ -276,6 +348,13 @@ msgid "Incorrect password!"
 msgstr "Nepravilno geslo!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr ""
 
@@ -285,6 +364,7 @@ msgstr ""
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -300,6 +380,8 @@ msgstr "Po 15s boste samodejno preusmerjeni"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Ali ${ clickHere }, da se vrnete na pixelplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 #, fuzzy
 msgid "No Captcha given"
@@ -333,6 +415,7 @@ msgstr "Ni nam uspelo ustvariti novega uporabnika :("
 msgid "Failed to establish session after register :("
 msgstr "Ni nam uspelo ustvariti seje po registraciji :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemlja"
@@ -374,8 +457,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Naš glavni kanvas, ogromen zemljevid sveta. Postavljajte kjer koli hočete"
 
@@ -388,6 +475,13 @@ msgstr ""
 "so del umetnin) ali slik večjih od 1.5k x 1.5k pikslov."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Postavljajte kvadratke na 3D kanvasu z drugimi"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Postavljajte kvadratke na 3D kanvasu z drugimi"
@@ -395,6 +489,7 @@ msgstr "Postavljajte kvadratke na 3D kanvasu z drugimi"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Poseben kanvas za širjenje zavedanja za SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -416,13 +511,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-sr.po

@@ -11,12 +11,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+<<<<<<< HEAD
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#: src/core/ChatProvider.js:434
+msgid "You can not send chat messages with proxy"
+msgstr "Nemožete poslati poruke sa proksijem"
+=======
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
 msgstr "Ne možete slati poruke dok koristite VPN"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:436
 msgid "Your country is temporary muted from this chat channel"
@@ -40,9 +49,15 @@ msgid "You are muted for another ${ timeMin } minutes"
 msgstr "Nemo ste za ${ timeMin } minuta"
 
 #: src/core/ChatProvider.js:450
+<<<<<<< HEAD
+#, fuzzy, javascript-format
+msgid "You are muted for another ${ ttl } seconds"
+msgstr "Nemo ste za ${ ttl } sekundi"
+=======
 #, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
 msgstr "Utišani ste za ${ ttl } sekundi"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:467
 #, javascript-format
@@ -93,6 +108,18 @@ msgstr "Uspešno promenjena lozinka."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Nevažeći url :( Molimo vas da proverite e-mail opet."
 
+<<<<<<< HEAD
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+#, fuzzy
+msgid "PixelPlanet.Fun PopUp"
+msgstr "PixelPlanet.Fun"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobus"
@@ -109,6 +136,8 @@ msgstr "Kliknite dva puta na globus da bi ste se vratili"
 msgid "Loading..."
 msgstr "Učitavanje..."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppzabava"
@@ -117,6 +146,7 @@ msgstr "ppzabava"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -133,6 +163,17 @@ msgstr "E-mail ne sme biti prazan."
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
+<<<<<<< HEAD
+msgstr "E-mail treba biti barem 5 karaktera."
+
+#: src/utils/validation.js:19
+msgid "Email can't be longer than 40 characters."
+msgstr "E-mail ne sme biti više od 40 karaktera."
+
+#: src/utils/validation.js:20
+msgid "Email should at least contain a dot"
+msgstr "E-mail treba barem imati tačku"
+=======
 msgstr "E-mail mora biti više od 5 karaktera."
 
 #: src/utils/validation.js:19
@@ -142,6 +183,7 @@ msgstr "E-mail ne sme imati više od 40 karaktera."
 #: src/utils/validation.js:20
 msgid "Email should at least contain a dot"
 msgstr "E-mail treba imati i tačku"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:22
 msgid "Email should contain a @"
@@ -149,6 +191,33 @@ msgstr "E-mail treba imati @"
 
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
+<<<<<<< HEAD
+msgstr "Ime ne sme biti prazno"
+
+#: src/utils/validation.js:30
+msgid "Name must be at least 2 characters long"
+msgstr "Ime treba biti barem 2 karaktera"
+
+#: src/utils/validation.js:31
+msgid "Name must be shorter than 26 characters"
+msgstr "Ime treba biti manje od 26 karaktera"
+
+#: src/utils/validation.js:38
+msgid "Name contains invalid character like @, /, \\ or #"
+msgstr "Ime ima nevažećih karaktera kao @, /, \\ ili #"
+
+#: src/utils/validation.js:53
+msgid "No password given."
+msgstr "Lozinka nije postavljena"
+
+#: src/utils/validation.js:56
+msgid "Password must be at least 6 characters long."
+msgstr "Lozinka treba biti barem 6 karaktera."
+
+#: src/utils/validation.js:59
+msgid "Password must be shorter than 60 characters."
+msgstr "Lozinka treba biti manja od 60 karaktera."
+=======
 msgstr "Ime ne sme da ostane prazno."
 
 #: src/utils/validation.js:30
@@ -174,6 +243,7 @@ msgstr "Lozinka mora imati bar 6 karaktera"
 #: src/utils/validation.js:59
 msgid "Password must be shorter than 60 characters."
 msgstr "Lozinka mora imati manje od 60 karaktera"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
 msgid "PixelPlanet.fun Password Reset"
@@ -211,11 +281,15 @@ msgstr "Potvrdi novu lozinku"
 
 #: src/ssr/PasswordReset.jsx:65
 msgid "Submit"
+<<<<<<< HEAD
+msgstr "Pošalji"
+=======
 msgstr "Podnesi"
 
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "Niste banovani"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
@@ -229,6 +303,49 @@ msgstr "Nemate pristup da vidite ovu stranicu"
 msgid "Just admins can do that"
 msgstr "Samo admini mogu to da rade"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Niste banovani"
+
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Verifikacija nije data"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-mail je već u koristi."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Ime je već u koristi."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Previše dugo vam je trebalo, pokušajte opet."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Niste uspeli da uradite verifikaciju"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Nepoznata greška sa verifikacijom"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Nije se mogao napraviti nov nalog :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Nije se uspelo da se napravi sednica posle registrovanja :("
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Verifikacija mail-a"
@@ -266,6 +383,14 @@ msgid "Incorrect password!"
 msgstr "Neispravna lozinka!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+=======
 msgid "Muted Users can not delete their account."
 msgstr "Utišani korisnici ne mogu da obrišu svoj nalog."
 
@@ -276,6 +401,7 @@ msgstr "Ovaj e-mail provajder nije dostupan"
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Utišani korisnici ne mogu uraditi to."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -290,6 +416,8 @@ msgstr "Bićete automatično vraćeni posle 15 sekundi"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Ili ${ clickHere } da bi ste se vratili na pixelplanet"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Verifikacija nije data"
@@ -322,6 +450,7 @@ msgstr "Nije se mogao napraviti nov nalog :("
 msgid "Failed to establish session after register :("
 msgstr "Nije se uspelo da se napravi sednica posle registrovanja :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemlja"
@@ -356,6 +485,18 @@ msgstr "Top10"
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr "Naš glavni kanvas, ogromna mapa sveta. Postavi piksele gde god hoćeš"
+
+=======
 msgstr "2bit"
 
 #: src/canvasesDesc.js:29
@@ -366,6 +507,7 @@ msgstr "Mini-mapa"
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr "Naše glavni platno, ogromna mapa sveta. Postavi piksele gde god hoćeš!"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:33
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of art) "
@@ -375,12 +517,21 @@ msgstr ""
 "ako deo crteža) ili crteže veće od 1.5k x 1.5k piksela."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Postavljaj voksele na 3D kanvasu sa drugima"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Specijalni kanvas za širenje informacija o SARS-CoV2"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Postavljaj voksele na 3D kanvasu sa drugima."
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Specijalni kanvas za širenje informacija o SARS-CoV2(vakciniši se)"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -402,16 +553,26 @@ msgstr ""
 "Kanvas za najaktivnije igrače od juče. Dnevni rang se ažurira u 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+msgstr ""
+=======
 msgid "Only four colors. Same rules as moon!"
 msgstr "Samo četiri boje.Važe ista pravila kao i na mesecu."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+msgstr ""
+=======
 "earth canvas!"
 msgstr ""
 "Osvajaj teritorije na manjoj mapi sa zaštićenim okeanom.Tajmer piksela je "
 "isti kao na Zemlji."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-to.po

@@ -101,6 +101,8 @@ msgstr "Naʻe lava lelei ʻo liliu ʻa e Passowrd."
 msgid "Invalid url :( Please check your mail again."
 msgstr "ʻIkai tonu e :( URL Kātaki ʻo toe vakaiʻi hoʻo meilí."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3DGlobe"
@@ -117,6 +119,7 @@ msgstr "Lomiʻi tuʻo ua ʻi he mamani ke toe foki."
 msgid "Loading..."
 msgstr "Load..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -125,6 +128,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3DGlobe"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Ko ha kolope 3D ʻo ʻetau mape kotoa"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Lomiʻi tuʻo ua ʻi he mamani ke toe foki."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Load..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -239,6 +261,11 @@ msgstr "ʻOku ʻikai ngofua ke ke hū ki he peesi ko ʻení"
 msgid "Just admins can do that"
 msgstr "ʻE lava ʻe he miniti pe ʻe taha ʻo fai ia"
 
+<<<<<<< HEAD
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "ʻOku ʻikai ke ke banned"
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Fakapapauʻi ʻo e meilí"
@@ -278,6 +305,7 @@ msgstr "ʻIkai tonu e lea fufuú!"
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
 msgstr ""
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
@@ -332,6 +360,66 @@ msgstr "ʻIkai lava ʻo faʻu ha foʻou ki he polokalamá :("
 msgid "Failed to establish session after register :("
 msgstr "ʻIkai lava ke fokotuʻu ha fakataha hili e lesisita :("
 
+<<<<<<< HEAD
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Fakapapauʻi ʻo e meilí"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Kuo fakapapauʻi he taimí ni :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"ʻOku ʻikai tonu hoʻo kouti fakapapauʻi ʻo e meilí pe kuo ʻosi e taimi "
+"ngāueʻaki :(, kātaki ʻo kole ha fika foʻou."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "ʻOku ʻikai ke ke hu ki he polokalama."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Fehalaaki ʻa e server ʻi he taimi ʻoku loka ai."
+
+#: src/routes/api/auth/change_mail.js:44
+#: src/routes/api/auth/change_passwd.js:34
+#: src/routes/api/auth/delete_account.js:36
+msgid "You are not authenticated."
+msgstr "ʻOku ʻikai ke ke authenticated."
+
+#: src/routes/api/auth/change_mail.js:53
+#: src/routes/api/auth/change_passwd.js:43
+#: src/routes/api/auth/delete_account.js:55
+msgid "Incorrect password!"
+msgstr "ʻIkai tonu e lea fufuú!"
+
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted users can not delete their account."
+msgstr ""
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+msgstr ""
+
+#: src/ssr/RedirectionPage.jsx:19
+msgid "PixelPlanet.fun Accounts"
+msgstr "Ngaahi ʻAkauni PixelPlanet.fun"
+
+#: src/ssr/RedirectionPage.jsx:29
+msgid "You will be automatically redirected after 15s"
+msgstr "ʻE toe fakafoki fakahangatonu atu koe hili 15s"
+
+#: src/ssr/RedirectionPage.jsx:30
+#, javascript-format
+msgid "Or ${ clickHere } to go back to pixelplanet"
+msgstr "Pe ${ clickHere } ke foki ki pixelplanet"
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Mamani"
@@ -373,8 +461,12 @@ msgid "Minimap"
 msgstr ""
 
 #: src/canvasesDesc.js:32
+<<<<<<< HEAD
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+=======
 #, fuzzy
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 "Ko ʻetau tefitoʻi fakatataa, ko ha mape lahi ʻo e mamani. Tuku ʻi he feituʻu "
 "kotoa pe ʻoku ke saiʻia ai"
@@ -389,6 +481,13 @@ msgstr ""
 "x 1.5 k."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "Fokotuʻu Voxels ʻi ha fakatataa 3D mo e niʻihi kehe"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+=======
 #, fuzzy
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "Fokotuʻu Voxels ʻi ha fakatataa 3D mo e niʻihi kehe"
@@ -396,6 +495,7 @@ msgstr "Fokotuʻu Voxels ʻi ha fakatataa 3D mo e niʻihi kehe"
 #: src/canvasesDesc.js:35
 #, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Fakatataa makehe ke fakamafola hono ʻiloʻi ʻo e SARS-CoV2"
 
 #: src/canvasesDesc.js:36
@@ -419,13 +519,21 @@ msgstr ""
 "fakamatala fakamuimuitaha ʻi he 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66

i18n/ssr-tr.po

@@ -2,8 +2,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2024-03-09 11:55+0000\n"
+"Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
+=======
 "PO-Revision-Date: 2024-03-11 20:59+0000\n"
 "Last-Translator: TCr3 <tcreeper.earth@gmail.com>\n"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "Language-Team: Turkish <https://hosted.weblate.org/projects/pixelplanet/"
 "server/tr/>\n"
 "Language: tr\n"
@@ -42,7 +47,11 @@ msgstr "${ timeMin } dakikalığına susturuldunuz"
 #: src/core/ChatProvider.js:450
 #, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
+<<<<<<< HEAD
+msgstr "${ ttl } saniyeliğine susturuldun"
+=======
 msgstr "${ ttl } saniyeliğine susturuldunuz"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/ChatProvider.js:467
 #, javascript-format
@@ -93,6 +102,8 @@ msgstr "Parolanız başarıyla değiştirildi."
 msgid "Invalid url :( Please check your mail again."
 msgstr "Geçersiz bağlantı :( Lütfen e-postanızı yeniden kontrol ediniz."
 
+<<<<<<< HEAD
+=======
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr "PixelPlanet.Fun 3BKüre"
@@ -109,6 +120,7 @@ msgstr "Küreye çift tıklayarak geri dönün."
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -117,6 +129,25 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
+<<<<<<< HEAD
+#: src/ssr/Globe.jsx:37
+msgid "PixelPlanet.Fun 3DGlobe"
+msgstr "PixelPlanet.Fun 3BKüresel"
+
+#: src/ssr/Globe.jsx:38
+msgid "A 3D globe of our whole map"
+msgstr "Tüm haritamızın 3 boyutlu küreseli"
+
+#: src/ssr/Globe.jsx:51
+msgid "Double click on globe to go back."
+msgstr "Küreye çift tıklayarak geri dön."
+
+#: src/ssr/Globe.jsx:52
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
@@ -132,6 +163,21 @@ msgstr "E-posta adresi boş olamaz."
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
+<<<<<<< HEAD
+msgstr "E-Posta en az 5 karakterden oluşmalıdır."
+
+#: src/utils/validation.js:19
+msgid "Email can't be longer than 40 characters."
+msgstr "E-Posta 40 karakterden uzun olamaz."
+
+#: src/utils/validation.js:20
+msgid "Email should at least contain a dot"
+msgstr "E-posta adresi içerisinde en az bir nokta bulundurmalıdır"
+
+#: src/utils/validation.js:22
+msgid "Email should contain a @"
+msgstr "E-posta adresi içerisinde @ bulundurmalıdır"
+=======
 msgstr "E-postanız en az 5 karakterden oluşmalıdır."
 
 #: src/utils/validation.js:19
@@ -145,6 +191,7 @@ msgstr "E-postanız en az bir nokta içermelidir"
 #: src/utils/validation.js:22
 msgid "Email should contain a @"
 msgstr "E-postanız @ içermelidir"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
@@ -152,7 +199,11 @@ msgstr "Kullanıcı adınız boş olamaz."
 
 #: src/utils/validation.js:30
 msgid "Name must be at least 2 characters long"
+<<<<<<< HEAD
+msgstr "Kullanıcı adı en az 2 karakterden oluşmalıdır"
+=======
 msgstr "Kullanıcı adınız en az 2 karakterden oluşmalıdır"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/utils/validation.js:31
 msgid "Name must be shorter than 26 characters"
@@ -217,6 +268,11 @@ msgstr "Onayla"
 msgid "You are not banned"
 msgstr "Yasaklı değilsiniz"
 
+<<<<<<< HEAD
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Bu e-posta sağlayıcısına izin verilmiyor"
+=======
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Giriş yapmadınız"
@@ -248,11 +304,66 @@ msgstr ""
 #: src/routes/api/auth/logout.js:11
 msgid "You are not even logged in."
 msgstr "Daha oturum bile açmadınız."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
 msgid "Server error when logging out."
 msgstr "Oturum kapatılırken sunucu hatası oluştu."
 
+<<<<<<< HEAD
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-posta adresi kullanımda."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Kullanıcı adı kullanımda."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Fazla uzun sürdü, tekrar dene."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Captcha'yı yanlış girdin"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Bilinmeyen Captcha Hatası"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Yeni hesap oluşturulamadı :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Hesap oluştururken bir hata meydana geldi :("
+
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "E-posta adresi doğrulaması"
+
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Artık hesabın doğrulandı :)"
+
+#: src/routes/api/auth/verify.js:35
+msgid ""
+"Your mail verification code is invalid or already expired :(, please request "
+"a new one."
+msgstr ""
+"Doğrulama kodun geçersiz veya süresi doldu :(, lütfen yeni bir talepte bulun."
+
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Henüz oturum açmadın."
+
+#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+msgid "Server error when logging out."
+msgstr "Oturum kapatılırken sunucu hatası oluştu."
+
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/routes/api/auth/change_mail.js:44
 #: src/routes/api/auth/change_passwd.js:34
 #: src/routes/api/auth/delete_account.js:36
@@ -266,6 +377,13 @@ msgid "Incorrect password!"
 msgstr "Yanlış parola!"
 
 #: src/routes/api/auth/delete_account.js:46
+<<<<<<< HEAD
+msgid "Muted users can not delete their account."
+msgstr "Susturulan kullanıcılar hesaplarını silemez."
+
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted users can not do this."
+=======
 msgid "Muted Users can not delete their account."
 msgstr "Susturulan kullanıcılar hesaplarını silemez."
 
@@ -275,6 +393,7 @@ msgstr "Bu e-posta sağlayıcısına izin verilmiyor"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Susturulan kullanıcılar bunu yapamaz."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -290,6 +409,8 @@ msgstr "15 saniye içerisinde otomatik olarak yönlendirileceksin"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Veya ${ clickHere } pixelplanet'e dönebilirsin"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr "Captcha girilmedi"
@@ -322,6 +443,7 @@ msgstr "Yeni kullanıcı oluşturulamadı :("
 msgid "Failed to establish session after register :("
 msgstr "Kayıttan sonra oturum oluşturulamadı :("
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Dünya"
@@ -357,6 +479,17 @@ msgstr "Top10"
 #: src/canvasesDesc.js:28
 msgid "2bit"
 msgstr "2bit"
+<<<<<<< HEAD
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr "Küçük harita"
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr "Ana tuvalimiz devasa dünya haritası. İstediğin yere piksel atabilirsin"
+
+=======
 
 #: src/canvasesDesc.js:29
 msgid "Minimap"
@@ -367,6 +500,7 @@ msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr ""
 "Ana tuvalimiz, devasa bir dünya haritası. İstediğin yere piksel atabilirsin!"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:33
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of art) "
@@ -376,12 +510,21 @@ msgstr ""
 "1500x1500'den büyük eserler yasaktır."
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr "3B tuvalde diğer oyuncularla birlikte küp pikseller at"
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr "Koronavirüs farkındalığını yaymak için özel olarak yapılan tuval"
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr "3B bir tuvalde diğer oyuncularla küpler yerleştirin."
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
 msgstr "Koronavirüs farkındalığını yaymak için özel olarak yapılan tuval."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -415,11 +558,27 @@ msgstr ""
 "Okyanusun korunduğu bu küçük dünyada fetihler yapın. Bu tuval Dünya tuvali "
 "ile bekleme süresini paylaşır!"
 
+#: src/canvasesDesc.js:40
+msgid "Only four colors. Same rules as moon."
+msgstr "Yalnızca dört renk. Ay ile aynı kurallar."
+
+#: src/canvasesDesc.js:41
+msgid ""
+"Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+"earth canvas."
+msgstr ""
+"Korumalı okyanus ile daha küçük bir dünya üzerinde toprak fethedin. Toprak "
+"tuvali ile bekleme süresini paylaşır."
+
 #: src/core/MailProvider.js:66
 #, javascript-format
 msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
+<<<<<<< HEAD
+msgstr "PixelPlanet'e hoş geldin ${ name }, lütfen e-posta adresini doğrula"
+=======
 msgstr ""
 "PixelPlanet'e hoş geldiniz ${ name }, lütfen e-posta adresinizi doğrulayın"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:67
 #, javascript-format
@@ -431,8 +590,13 @@ msgid ""
 "welcome to our little community of pixelplacers, to use your account, you "
 "have to verify your mail. You can do that here: "
 msgstr ""
+<<<<<<< HEAD
+"piksel atanlardan oluşan topluluğumuza hoş geldin, hesabını kullanmak için e-"
+"posta adresini doğrula. Buradan yapabilirsin: "
+=======
 "piksel atanlardan oluşan bu küçük topluluğumuza hoş geldiniz, hesabınızı "
 "kullanabilmek için e-posta adresini doğrulayın. Bunu buradan yapabilirsiniz: "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/core/MailProvider.js:68
 msgid "Click to Verify"
@@ -483,7 +647,11 @@ msgid ""
 "If you did not request this mail, please just ignore it (the ip that "
 "requested this mail was ${ ip })."
 msgstr ""
+<<<<<<< HEAD
+"Eğer bu postayı talep etmediysen lütfen görmezden gel (bu postayı talep eden "
+=======
 "Eğer bu e-postayı siz istemediyseniz lütfen görmezden gelin (bunu isteyen "
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 "ip: ${ ip })."
 
 #: src/core/MailProvider.js:114
@@ -500,7 +668,11 @@ msgstr ""
 
 #: src/core/MailProvider.js:130
 msgid "Couldn't find this mail in our database"
+<<<<<<< HEAD
+msgstr "Bu e-posta adresini veri tabanımızda bulamadık"
+=======
 msgstr "Bu e-posta adresini veritabanımızda bulamadık"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #~ msgid "Ow no! Spam protection decided to mute you"
 #~ msgstr "Olamaz! Spam koruması seni susturdu"

i18n/template-ssr.pot

@@ -82,6 +82,14 @@ msgstr ""
 msgid "Invalid url :( Please check your mail again."
 msgstr ""
 
+#: src/ssr/PopUp.jsx:47
+msgid "ppfun"
+msgstr ""
+
+#: src/ssr/PopUp.jsx:48
+msgid "PixelPlanet.Fun PopUp"
+msgstr ""
+
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
 msgstr ""
@@ -98,6 +106,8 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
+<<<<<<< HEAD
+=======
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr ""
@@ -106,6 +116,7 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr ""
@@ -282,6 +293,52 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/canvasesDesc.js:20
+msgid "Earth"
+msgstr ""
+
+#: src/canvasesDesc.js:21
+msgid "Moon"
+msgstr ""
+
+#: src/canvasesDesc.js:22
+msgid "3D Canvas"
+msgstr ""
+
+#: src/canvasesDesc.js:23
+msgid "Coronavirus"
+msgstr ""
+
+#: src/canvasesDesc.js:24
+msgid "PixelZone"
+msgstr ""
+
+#: src/canvasesDesc.js:25
+msgid "PixelCanvas"
+msgstr ""
+
+#: src/canvasesDesc.js:26
+msgid "1bit"
+msgstr ""
+
+#: src/canvasesDesc.js:27
+msgid "Top10"
+msgstr ""
+
+#: src/canvasesDesc.js:28
+msgid "2bit"
+msgstr ""
+
+#: src/canvasesDesc.js:29
+msgid "Minimap"
+msgstr ""
+
+#: src/canvasesDesc.js:32
+msgid "Our main canvas, a huge map of the world. Place everywhere you like"
+msgstr ""
+
+=======
 #: src/routes/api/auth/register.js:31
 msgid "No Captcha given"
 msgstr ""
@@ -358,6 +415,7 @@ msgstr ""
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr ""
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:33
 msgid ""
 "Moon canvas. Safe space for art. No flags or large text (unless part of "
@@ -365,6 +423,27 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:34
+<<<<<<< HEAD
+msgid "Place Voxels on a 3D canvas with others"
+msgstr ""
+
+#: src/canvasesDesc.js:35
+msgid "Special canvas to spread awareness of SARS-CoV2"
+msgstr ""
+
+#: src/canvasesDesc.js:36
+msgid "Mirror of PixelZone"
+msgstr ""
+
+#: src/canvasesDesc.js:37
+msgid "Mirror of PixelCanvas"
+msgstr ""
+
+#: src/canvasesDesc.js:38
+msgid "Black and White canvas"
+msgstr ""
+
+=======
 msgid "Place Voxels on a 3D canvas with others."
 msgstr ""
 
@@ -384,6 +463,7 @@ msgstr ""
 msgid "Black and White canvas"
 msgstr ""
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:39
 msgid ""
 "A canvas for the most active players from the the previous day. Daily "
@@ -391,13 +471,21 @@ msgid ""
 msgstr ""
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/canvasesDesc.js:41
 msgid ""
 "Conquer land on a smaller earth with protected ocean. Shares cooldown with "
+<<<<<<< HEAD
+"earth canvas."
+=======
 "earth canvas!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/core/MailProvider.js:66