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
@@ -28,5 +29,6 @@ node_modules/
 osm.tar.gz
 clean.png
 backup
+backup/*
 ips
 pixelplanetmap.zip

AUTHORS

@@ -1,21 +0,0 @@
-# This is the list of pixelplanets significant contributors.
-#
-# This does not necessarily list everyone who has contributed code.
-# If you authored code, feel free to add your name and optionally your
-# PGP public key below it.
-
-
-HF <hf@pixelplanet.fun>
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZh4aCxYJKwYBBAHaRw8BAQdAbv6ca5okEYqyb6h8uG4J54bhP+L2fDsvj5YO
-VMSMgk20F0hGIDxoZkBwaXhlbHBsYW5ldC5mdW4+iJkEExYKAEEWIQQvEFNFVajM
-Ad8LrS7nq7uCcWL5zAUCZh4aCwIbAwUJBaOagAULCQgHAgIiAgYVCgkICwIEFgID
-AQIeBwIXgAAKCRDnq7uCcWL5zNjFAP0d9LfJ/5vSRVPA1WYMyUFsTFYtO8p3edyC
-FPoRE8VN8wEAj4ZWuEqcIOiTBHoNDBpNmV15zMxl/XA52e1qDxKOWwi4OARmHhoL
-EgorBgEEAZdVAQUBAQdABtF2ec6tRBTvd+xw/BSAVxzUHSeMK336ElztLCddIGMD
-AQgHiH4EGBYKACYWIQQvEFNFVajMAd8LrS7nq7uCcWL5zAUCZh4aCwIbDAUJBaOa
-gAAKCRDnq7uCcWL5zJF+AP94fSkgvBa7vJvOrjPW6J/wsmXAmnd8ckT+DEy79/oe
-xgD+IkV/Td8jymaHwaqzwQljM1KRTA+NaQBcPiXh/9XBwg0=
-=YLWT
------END PGP PUBLIC KEY BLOCK-----

LICENSE

@@ -1,5 +1,5 @@
 pixelplanet - Collaborative online canvas to draw with multiple people
-Copyright (C) 2020, 2024 hf <hf@pixelplanet.fun>
+Copyright (C) 2020, 2024 hf
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as

README.md

@@ -3,14 +3,16 @@
 
 [![Guilded](https://img.shields.io/badge/Discord-Support-blue.svg)](https://pixelplanet.fun/guilded)
 
+Official  repository of [pixelplanet.fun](http://www.pixelplanet.fun).
+
 ![videothumb](promotion/videothumb.gif)
 
 > Our translations are hosted [on Weblate](https://hosted.weblate.org/projects/pixelplanet), information on how to contribute is available under [i18n](./i18n). We very much appreciate any help. 
 
 [![Translation status](https://hosted.weblate.org/widget/pixelplanet/svg-badge.svg)](https://hosted.weblate.org/engage/pixelplanet/)
 
-To the 2nd anniversary of r/space, pixelplanet takes pixelgames to a new level. Place pixels, create pixelart and fight faction wars.
-Pixelplanet presents a 65k x 65k large canvas that is a map of the world and can also be seen as 3d globe, you can place pixels where ever you want, build an island, take over another country with a flag or just create pixelart.
+To the 2nd anniversary of r/space, pixelplanet takes pixelgames to a new level. Place pixels, create pixelart and fight faction wars on pixelplanet.fun.
+Pixelplanet is a 65k x 65k large canvas that is a map of the world and can also be seen as 3d globe, you can place pixels where ever you want, build an island, take over another country with a flag or just create pixelart.
 30 well chosen colors (decided by polls within the community) are available and you can place a pixel every 3s on an empty space, and 5s on an already set pixel. But pixels can be stacked up to a minute, so you don't have to wait every time.
 
 Pixelplanet receives regular updates and launches events, like a zero second cooldown day on r/place anniversary. We are driven by our community, because placing pixels is more fun together.
@@ -47,7 +49,7 @@ All needed files to run it got created in `./dist`. You can copy it to wherever
 ### Requirements
 
 - [nodejs environment](https://nodejs.org/en/) (>=18)
-- [redis](https://redis.io/) or [redis-for-windows](https://github.com/redis-windows/redis-windows) in version **6.2.0 or above** as database for storìng the canvas
+- [redis](https://redis.io/) or [redis-for-windows](https://github.com/redis-windows/redis-windows) as database for storìng the canvas 
 - mysql or mariadb ([setup own user](https://www.digitalocean.com/community/tutorials/how-to-create-a-new-user-and-grant-permissions-in-mysql) and [create database](https://www.w3schools.com/SQl/sql_create_db.asp) for pixelplanet) for storing additional data like IP blacklist
 
 ### Configuration
@@ -82,7 +84,7 @@ Configuration takes place in the environment variables that are defined in ecosy
 | BACKUP_DIR        | mounted directory of backup server    | "/mnt/backup/"            |
 | HOURLY_EVENT      | run hourly void event on main canvas  | 1                         |
 | USE_MAILER        | enable to use mail sevicse            | 0                         |
-| MAIL_ADDRESS      | email address for sending mails       | "noreply@example.com" |
+| MAIL_ADDRESS      | email address for sending mails       | "noreply@pixelplanet.fun" |
 
 #### Social Media Configuration
 

i18n/lccc.json

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

i18n/ssr-ar.po

@@ -109,11 +109,11 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr ""
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 
@@ -203,6 +203,10 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr ""
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr ""
@@ -211,54 +215,10 @@ msgstr ""
 msgid "You are not allowed to access this page"
 msgstr ""
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr ""
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr ""
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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 ""
@@ -297,6 +257,10 @@ msgstr ""
 msgid "Muted Users can not delete their account."
 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/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr ""
@@ -314,6 +278,38 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+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 ""
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr ""

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,11 +120,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Digər oyunçularla biryerdə fərqli lövhələrdə fərqli rənglərdə pixellər atın"
@@ -212,6 +234,10 @@ msgstr "Yeni Parolu Doğrulayın"
 msgid "Submit"
 msgstr "Təqdim edin"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Sən banlı deyilsən"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Siz daxil olmamısınız"
@@ -220,58 +246,16 @@ msgstr "Siz daxil olmamısınız"
 msgid "You are not allowed to access this page"
 msgstr "Sizin bu səhifəyi görüntüləməyə icazəniz yoxdur"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Sadəcə adminlər bunu edəbilər"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Sən banlı deyilsən"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha mətni verilməyib"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Email artıq istifadə olunur."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Ad artıq istifadə olunur."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Bu çox vaxt aldı,təkrar yoxla."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Captchanızı düzgün yerinə yetirmədiniz"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Naməlum Captcha Xətası"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Bu email provayderinə icazə verilmir"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Yeni istifadəçi yaradılamadı :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Hesab oluşdurulurkən bir xəta meydana gəldi :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 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ı :)"
@@ -309,6 +293,11 @@ 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"
+
 #: src/routes/api/auth/change_mail.js:62
 #, fuzzy
 msgid "Muted Users can not do this."
@@ -327,6 +316,98 @@ msgstr "15 saniyə sonra avtomatik olaraq yönləndiriləcəksən"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Vəya Pixelplanetə qayıtmaq üçün bura basın ${ clickHere }"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Captcha mətni verilməyib"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Email artıq istifadə olunur."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Ad artıq istifadə olunur."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Bu çox vaxt aldı,təkrar yoxla."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Captchanızı düzgün yerinə yetirmədiniz"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Naməlum Captcha Xətası"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Yeni istifadəçi yaradılamadı :("
+
+#: src/routes/api/auth/register.js:105
+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"
@@ -361,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
@@ -370,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"
@@ -384,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"
@@ -391,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
@@ -414,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."
@@ -426,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,11 +124,30 @@ msgstr "ппфан"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "Усплывальнае акно PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Стаўце рознакаляровыя пікселі на палатне ў выглядзе мапы свету анлайн, разам "
@@ -217,6 +239,10 @@ msgstr "Пацвярдзіце новы пароль"
 msgid "Submit"
 msgstr "Даслаць"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Вы не забанены"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Вы не ўвайшлі ў акаўнт"
@@ -225,54 +251,107 @@ msgstr "Вы не ўвайшлі ў акаўнт"
 msgid "You are not allowed to access this page"
 msgstr "Вам нельга захадзіць на гэтую старонку"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Толькі адміністратары могуць гэта рабіць"
 
-#: 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 "Спраўджанне пошты"
 
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Капча адсутнічае"
+<<<<<<< HEAD
+=======
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Цяпер вы спраўджаны :)"
 
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-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/register.js:32
-msgid "Username already in use."
-msgstr "Гэтае імя ўжо выкарыстоўваецца."
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Вы нават не ўвайшлі ў акаўнт."
 
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-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/register.js:58
-msgid "You failed your captcha"
-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/register.js:61
-msgid "Please refresh the website"
+#: 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/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Невядомая памылка капчы"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+>>>>>>> 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-правайдэр забанены"
 
-#: src/routes/api/auth/register.js:92
+#: 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"
+
+#: src/routes/api/auth/register.js:31
+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:108
+#: src/routes/api/auth/register.js:105
 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 "Спраўджанне пошты"
@@ -310,11 +389,11 @@ msgid "Incorrect password!"
 msgstr "Няправільны пароль!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+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 do this."
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -330,6 +409,8 @@ msgstr "Вы будзеце аўтаматычна перанакіраваны
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Альбо ${ clickHere } каб вярнуцца да pixelplanet"
 
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Зямля"
@@ -371,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 ""
 "Наша галоўнае палатно, вялізарная мапа свету. Стаўце пікселі дзе заўгодна"
 
@@ -385,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 палатне разам з іншымі"
@@ -392,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
@@ -415,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"
-"PO-Revision-Date: 2024-05-04 13:07+0000\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.3\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,11 +152,12 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun изкачащ прозорец"
 
-#: src/ssr/Main.jsx:68
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Слагайте цветни пиксели на платно в стил карта с други играчи онлайн"
 
@@ -211,6 +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 "Не сте логнати"
@@ -219,54 +262,53 @@ msgstr "Не сте логнати"
 msgid "You are not allowed to access this page"
 msgstr "Нямате достъп до тази страница"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Само администраторите имат право на това"
 
+<<<<<<< HEAD
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "Не сте баннати"
 
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Не е дадена Captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Имейлът вече се използва."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Потребителското име вече се използва."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Отне Ви твърде много време, опитайте отново."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Не успяхте да направите captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Неизвестна Captcha грешка"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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:92
+#: 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:108
+#: 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 "Потвърждение на имейла"
@@ -304,11 +346,23 @@ msgid "Incorrect password!"
 msgstr "Грешна парола!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+<<<<<<< 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 "Заглушени потребители не могат да изтрият техния профил."
+
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr "Заглушени потребители не могат да правят това."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -324,6 +378,41 @@ 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"
+
+#: 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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Земя"
@@ -358,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
@@ -369,6 +471,7 @@ msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr ""
 "Нашето главно платно, огромна карта на света. Поставяйте навсякъде, където "
 "желаете!"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:33
 msgid ""
@@ -379,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"
@@ -407,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
@@ -487,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

@@ -2,20 +2,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-04-16 07:23+0000\n"
-"Last-Translator: Aerobiosis <aerobiosis115@gmail.com>\n"
-"Language-Team: Catalan <https://hosted.weblate.org/projects/pixelplanet/"
-"server/ca/>\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: ca\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: Weblate 5.5-dev\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"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"
-msgstr "No pots enviar missatges al xat mentre estiguis utilitzant “proxys”"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+msgstr "No pots enviar missatges al xat amb un proxy"
 
 #: src/core/ChatProvider.js:436
 #, fuzzy
@@ -29,12 +33,13 @@ msgstr ""
 "mute"
 
 #: src/core/ChatProvider.js:441
+#, fuzzy
 msgid "You are banned"
-msgstr "Has sigut vetat"
+msgstr "No has iniciat sessió"
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
-msgstr "El teu proveïdor d'internet està vetat"
+msgstr ""
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
@@ -57,7 +62,7 @@ msgstr "No tens accés a aquest canal"
 
 #: src/core/ChatProvider.js:490
 msgid "Your mail has to be verified in order to chat"
-msgstr "S'ha de verificar el correu electrònic per poder xatejar"
+msgstr "El teu correu electrònic ha de ser verificat per poder xatejar"
 
 #: src/core/ChatProvider.js:500
 msgid "You can't send a message this long :("
@@ -69,11 +74,11 @@ msgstr "Si us plau, utilitza el canal \"int\""
 
 #: src/core/ChatProvider.js:512
 msgid "Stop flooding."
-msgstr "Calma't una mica."
+msgstr "Para de fer flood."
 
 #: src/routes/reset_password.js:39
 msgid "You sent an empty password or invalid data :("
-msgstr "La contrasenya o dades que has enviat són invàlides :("
+msgstr "Has enviat una contrasenya buida o dades invàlides :("
 
 #: src/routes/reset_password.js:51
 msgid "This password-reset link isn't valid anymore :("
@@ -81,7 +86,7 @@ msgstr "Aquest enllaç per restablir la contrasenya ja no és vàlid :("
 
 #: src/routes/reset_password.js:62
 msgid "Your passwords do not match :("
-msgstr "Les contrasenyes no coincideixen :("
+msgstr "Les contrasenyes són diferents :("
 
 #: src/routes/reset_password.js:77
 msgid "User doesn't exist in our database :("
@@ -89,57 +94,79 @@ msgstr "L'usuari no existeix a la nostra base de dades :("
 
 #: src/routes/reset_password.js:89
 msgid "Password successfully changed."
-msgstr "La contrasenya ha sigut reemplaçada amb èxit."
+msgstr "La contrasenya s'ha canviat exitosament."
 
 #: src/routes/reset_password.js:108
 msgid "Invalid url :( Please check your mail again."
 msgstr ""
-"URL invàlida :( Si us plau, comprova el teu correu electrònic un altre cop."
+"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 "Globus 3D de PixelPlanet.Fun"
+msgstr "PixelPlanet.Fun Món3D"
 
 #: src/ssr/Globe.jsx:38
 msgid "A 3D globe of our whole map"
-msgstr "Un globus 3D del nostre mapa sencer"
+msgstr "Una bola del món en 3D del nostre mapa sencer"
 
 #: src/ssr/Globe.jsx:51
 msgid "Double click on globe to go back."
-msgstr "Fes doble clic al globus per tornar i aterrar on pitgis."
+msgstr "Doble clic a la bola del món per tornar enrere."
 
 #: src/ssr/Globe.jsx:52
 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 "ppfun"
+msgstr ""
 
 #: src/ssr/PopUp.jsx:48
+#, fuzzy
 msgid "PixelPlanet.Fun PopUp"
-msgstr "Finestra emergent de PixelPlanet.fun"
+msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
+#, fuzzy
 msgid "PixelPlanet.Fun"
-msgstr "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
-"Pinta amb píxels de colors en un gran llenç amb altres jugadors en línia"
+"Col·loca píxels de colors en un gran llenç amb altres jugadors en línia"
 
 #: src/utils/validation.js:17
 msgid "Email can't be empty."
-msgstr "Has d'omplir el correu electrònic."
+msgstr "El correu electrònic no pot estar buit."
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
-msgstr "El correu electrònic ha de comptar, com a mínim, amb 5 caràcters."
+msgstr "El correu electrònic ha de tenir com a mínim 5 caràcters."
 
 #: src/utils/validation.js:19
 msgid "Email can't be longer than 40 characters."
-msgstr "El correu electrònic no pot contenir més de 40 caràcters."
+msgstr "El correu electrònic no pot tenir més de 40 caràcters."
 
 #: src/utils/validation.js:20
 msgid "Email should at least contain a dot"
@@ -151,19 +178,20 @@ msgstr "El correu electrònic ha de contenir una @"
 
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
-msgstr "El nom és obligatori."
+msgstr "El nom no pot estar buit."
 
 #: src/utils/validation.js:30
+#, fuzzy
 msgid "Name must be at least 2 characters long"
-msgstr "El nom ha de ser com a mínim de 2 caràcters"
+msgstr "El nom ha de tenir com a mínim 4 caràcters"
 
 #: src/utils/validation.js:31
 msgid "Name must be shorter than 26 characters"
-msgstr "El nom no pot tenir més de 26 caràcters"
+msgstr "El nom ha de tenir menys de 26 caràcters"
 
 #: src/utils/validation.js:38
 msgid "Name contains invalid character like @, /, \\ or #"
-msgstr "El nom conté caràcters invalids com:  @   /   \\   #"
+msgstr "El nom conté caràcters invalids com @  /  \\  #"
 
 #: src/utils/validation.js:53
 msgid "No password given."
@@ -215,6 +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ó"
@@ -223,55 +259,54 @@ msgstr "No has iniciat sessió"
 msgid "You are not allowed to access this page"
 msgstr "No tens permís per accedir a aquesta pàgina"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "No s'ha rebut el captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "El correu electrònic ja està en ús."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "El nom d'usuari ja està en ús."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Has trigat massa, prova-ho un altre cop."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Has fallat el captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Error de captcha desconegut"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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:92
+#: 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:108
+#: 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"
@@ -310,11 +345,23 @@ 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 ""
 
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -330,6 +377,41 @@ 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"
+
+#: 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/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-ckb.po

@@ -1,506 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2024-04-29 11:08+0000\n"
-"Last-Translator: Ahmed kurdish <nikogaming500@gmail.com>\n"
-"Language-Team: Kurdish (Central) <https://hosted.weblate.org/projects/"
-"pixelplanet/server/ckb/>\n"
-"Language: ckb\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5.2\n"
-
-#: src/core/ChatProvider.js:434
-msgid "You can not send chat messages while using a 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
-msgid "You are banned"
-msgstr "تۆ قەدەغەکراویت"
-
-#: src/core/ChatProvider.js:443
-msgid "Your Internet Provider is banned"
-msgstr "دابینکەری ئینتەرنێتەکەت قەدەغەیە"
-
-#: src/core/ChatProvider.js:448
-#, javascript-format
-msgid "You are muted for another ${ timeMin } minutes"
-msgstr "بۆ ماوەی ${ timeMin } خولەکێکی تر بێدەنگ دەکرێیت"
-
-#: src/core/ChatProvider.js:450
-#, javascript-format
-msgid "You are muted for another ${ ttl } seconds"
-msgstr "بۆ ماوەی ${ ttl } چرکەیەکی تر بێدەنگ دەکرێیت"
-
-#: src/core/ChatProvider.js:467
-#, javascript-format
-msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
-msgstr "تۆ زۆر خێرا نامە دەنێری، دەبێت چاوەڕێ بکەیت ${ waitTime }s :("
-
-#: src/core/ChatProvider.js:471
-msgid "You don't have access to this channel"
-msgstr "تۆ دەستت بەم کەناڵە ناگات"
-
-#: src/core/ChatProvider.js:490
-msgid "Your mail has to be verified in order to chat"
-msgstr "بۆ ئەوەی چات بکەیت دەبێت پۆستەکەت پشتڕاست بکرێتەوە"
-
-#: 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 "تکایە کەناڵی int بەکاربهێنە"
-
-#: 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
-msgid "Your passwords do not match :("
-msgstr "وشە تێپەڕەکەت وەک یەک نیە :("
-
-#: src/routes/reset_password.js:77
-msgid "User doesn't exist in our database :("
-msgstr "بەکارهێنەر لە بنکەدراوەی ئێمەدا بوونی نییە :("
-
-#: src/routes/reset_password.js:89
-msgid "Password successfully changed."
-msgstr "وشەی نهێنی بە سەرکەوتوویی گۆڕا."
-
-#: src/routes/reset_password.js:108
-msgid "Invalid url :( Please check your mail again."
-msgstr "لینکەکە نادروستە :( تکایە دووبارە پۆستەکەت بپشکنە."
-
-#: src/ssr/Globe.jsx:37
-msgid "PixelPlanet.Fun 3DGlobe"
-msgstr "PixelPlanet.Fun گلۆبی سێ ڕەهەندی"
-
-#: 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 "دووجار کلیک لەسەر گلۆب بکە بۆ گەڕانەوە."
-
-#: src/ssr/Globe.jsx:52
-msgid "Loading..."
-msgstr "بارکردن..."
-
-#: src/ssr/PopUp.jsx:47
-msgid "ppfun"
-msgstr "ppfun"
-
-#: src/ssr/PopUp.jsx:48
-msgid "PixelPlanet.Fun PopUp"
-msgstr "PixelPlanet.fun پۆپ ئاپ"
-
-#: src/ssr/Main.jsx:68
-msgid "PixelPlanet.Fun"
-msgstr "PixelPlanet.Fun"
-
-#: src/ssr/Main.jsx:69
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-"پێکسڵی ڕەنگاو ڕەنگ لەسەر کانڤاسێکی ستایلی نەخشە لەگەڵ یاریزانەکانی تر بە "
-"شێوەی ئۆنلاین دابنێ"
-
-#: src/utils/validation.js:17
-msgid "Email can't be empty."
-msgstr "ئیمەیڵ ناتوانێت بەتاڵ بێت."
-
-#: src/utils/validation.js:18
-msgid "Email should be at least 5 characters long."
-msgstr "ئیمەیڵ بەلایەنی کەمەوە ٥ پیت بێت."
-
-#: src/utils/validation.js:19
-msgid "Email can't be longer than 40 characters."
-msgstr "ئیمەیڵ ناتوانێت لە ٤٠ پیت زیاتر بێت."
-
-#: 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 "ئیمەیڵەکە پێویستی بە @ هەیە"
-
-#: src/utils/validation.js:29
-msgid "Name can't be empty."
-msgstr "ناو ناتوانێت بەتاڵ بێت."
-
-#: src/utils/validation.js:30
-msgid "Name must be at least 2 characters long"
-msgstr "ناوەکە دەبێت بەلایەنی کەمەوە ٢ پیت بێت"
-
-#: src/utils/validation.js:31
-msgid "Name must be shorter than 26 characters"
-msgstr "ناوەکە دەبێت لە ٢٦ پیت کورتتر بێت"
-
-#: src/utils/validation.js:38
-msgid "Name contains invalid character like @, /, \\ or #"
-msgstr "ناو پیتێکی نادروستی تێدایە وەک @، /، \\ یان #"
-
-#: src/utils/validation.js:53
-msgid "No password given."
-msgstr "هیچ وشەی نهێنی نەدراوە."
-
-#: src/utils/validation.js:56
-msgid "Password must be at least 6 characters long."
-msgstr "وشەی نهێنی بە لایەنی کەمەوە پێویستە ٦ پیت بێت."
-
-#: src/utils/validation.js:59
-msgid "Password must be shorter than 60 characters."
-msgstr "وشەی نهێنی دەبێت لە ٦٠ پیت کورتتر بێت."
-
-#: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
-msgid "PixelPlanet.fun Password Reset"
-msgstr "PixelPlanet.fun گۆڕینی وشەی نهێنی"
-
-#: 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
-msgid "Reset Password"
-msgstr "وشەی نهێنی ڕێکبخەرەوە"
-
-#: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
-msgid "Click here"
-msgstr "گرتەی ئێرە بکە"
-
-#: src/ssr/PasswordReset.jsx:30
-msgid "to go back to pixelplanet"
-msgstr "بۆ ئەوەی بگەڕێتەوە بۆ pixelplanet"
-
-#: src/ssr/PasswordReset.jsx:50
-#, javascript-format
-msgid "Hello ${ name }, you can set your new password here:"
-msgstr "سڵاو ${ name }، دەتوانیت لێرەدا وشەی نهێنی نوێت دابنێیت:"
-
-#: src/ssr/PasswordReset.jsx:54
-msgid "New Password"
-msgstr "تێپەڕەوشەی نوێ"
-
-#: src/ssr/PasswordReset.jsx:60
-msgid "Confirm New Password"
-msgstr "دووبارە کردنەوە ووشەى نهێنى نوێ"
-
-#: src/ssr/PasswordReset.jsx:65
-msgid "Submit"
-msgstr "پێشکەشکردن"
-
-#: src/routes/api/modtools.js:53
-msgid "You are not logged in"
-msgstr "تۆ داخڵ نەبوویت"
-
-#: src/routes/api/modtools.js:65
-msgid "You are not allowed to access this page"
-msgstr "ڕێگەت پێنادرێت بچیتە ناو ئەم لاپەڕەیە"
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr "تەنها ئەدمینەکان دەتوانن ئەوە بکەن"
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "تۆ قەدەغە نەکراویت"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "هیچ کاپچایەک نەدراوە"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "ئەم ئیمەیڵە پێشتر بەکارهاتووە."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "ئەو ناوە پێشتر بەکارهاتووە."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "زۆر کاتت برد، دووبارە هەوڵبدەرەوە."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "تۆ شکستت هێنا لە کاپچاکەت"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "هەڵەی کاپچای نەناسراو"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "ئەم دابینکەری ئیمەیڵە ڕێگەپێدراو نییە"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "شکستی هێنا لە دروستکردنی بەکارهێنەری نوێ :("
-
-#: src/routes/api/auth/register.js:108
-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
-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 "دوای ١٥س بە شێوەیەکی ئۆتۆماتیکی ئاڕاستە دەکرێیتەوە"
-
-#: src/ssr/RedirectionPage.jsx:30
-#, javascript-format
-msgid "Or ${ clickHere } to go back to pixelplanet"
-msgstr "یان ${ clickHere } بۆ گەڕانەوە بۆ پێکسڵ پلانێت"
-
-#: 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 anywhere 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 ""
-"کانڤاسی مانگ. شوێنی سەلامەت بۆ هونەر. هیچ ئاڵایەک یان دەقێکی گەورە (مەگەر "
-"بەشێک لە هونەر نەبێت) یان هونەرێک کە لە ١.٥ک x ١.٥ک پێکسڵ گەورەتر بێت."
-
-#: src/canvasesDesc.js:34
-msgid "Place Voxels on a 3D canvas with others."
-msgstr "ڤۆکسێلەکان لەسەر کانڤاسێکی سێ ڕەهەندی لەگەڵ کەسانی تر دابنێ."
-
-#: src/canvasesDesc.js:35
-msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-msgstr ""
-"کانڤاسی تایبەت بۆ بڵاوکردنەوەی هۆشیاری لەبارەی SARS-CoV2 (ڤاکسەکە وەربگرە)."
-
-#: 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 ""
-"کانڤاسێک بۆ چالاکترین یاریزانانی ڕۆژی پێشوو. نوێکارییەکانی ڕیزبەندی ڕۆژانە "
-"لە کاتژمێر ٠٠:٠٠ UTC."
-
-#: 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 "بەخێربێن ${ name } بۆ پێکسڵ پلانێت، تکایە پۆستەکەت پشتڕاست بکەرەوە"
-
-#: src/core/MailProvider.js:67
-#, javascript-format
-msgid "Hello ${ name }"
-msgstr "سڵاو ${ name }"
-
-#: 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 ""
-"پێشتر ئیمەیڵێکی پشتڕاستکردنەوەمان بۆ ناردوویت، دەتوانیت لە ماوەی "
-"${ minLeft } خولەکدا داوای پۆستێکی تر بکەیت."
-
-#: 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 ""
-"ئەگەر داوای ئەم پۆستەت نەکردووە، تکایە تەنها پشتگوێی بخە (ئەو ipەی کە داوای "
-"ئەم پۆستەی کردبوو ${ ip })."
-
-#: src/core/MailProvider.js:114
-msgid "Mail is not configured on the server"
-msgstr "پۆست لەسەر سێرڤەرەکە ڕێکنەخراوە"
-
-#: src/core/MailProvider.js:122
-msgid ""
-"We already sent you a mail with instructions. Please wait before requesting "
-"another mail."
-msgstr ""
-"پێشتر پۆستێکمان بۆ ناردوون کە ڕێنماییەکانی تێدابوو. تکایە چاوەڕێ بکە پێش "
-"ئەوەی داوای پۆستێکی تر بکەیت."
-
-#: src/core/MailProvider.js:130
-msgid "Couldn't find this mail in our database"
-msgstr "نەتوانرا ئەم ئیمەیڵە لە بنکەدراوەی ئێمەدا بدۆزرێتەوە"

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,12 +145,13 @@ msgstr "ppfun"
 #: src/ssr/PopUp.jsx:48
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Stawiôj farwné piksele na kôrtowatëch płótnach z jinszima graczama online"
@@ -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,6 +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"
@@ -222,53 +265,53 @@ msgstr "Të nie jes zalogòwóny"
 msgid "You are not allowed to access this page"
 msgstr "Të ni môsz ùdowierzeniô do przistãpù do ti starnë"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
-msgstr "Leno sprôwnicë mògą to robic"
+<<<<<<< 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/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha nie òsta pòdónô"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-mail ju w ùżëcym."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Pòzwa brëkòwnika ju w ùżëcym."
-
-#: src/routes/api/auth/register.js:55
-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:58
-msgid "You failed your captcha"
-msgstr "Nie przeszedł jes testu captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Nieznónô fela Captchë"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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:92
+#: 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:108
+#: 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"
@@ -292,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
@@ -307,13 +358,25 @@ 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."
 
+#: 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/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
@@ -329,6 +392,41 @@ 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ô"
+
+#: 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 przeszedł jes testu captcha"
+
+#: 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 :("
+
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemia"
@@ -367,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"
 
@@ -382,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
@@ -392,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
@@ -415,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
@@ -442,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"
@@ -485,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
@@ -505,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

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-04-16 07:23+0000\n"
-"Last-Translator: ok what <dhyrbfytyreal123@gmail.com>\n"
+"PO-Revision-Date: 2024-03-18 19:50+0000\n"
+"Last-Translator: asd <petr.pesek.99@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/pixelplanet/server/"
 "cs/>\n"
 "Language: cz\n"
@@ -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,11 +129,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Polož barevné pixely na mapově stylovaném plátnem s ostatníma online hráčema"
@@ -213,6 +243,10 @@ msgstr "Potvrdit Nový Heslo"
 msgid "Submit"
 msgstr "Vytvořit"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Nejste zabanován"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Nejsi přihlášenej"
@@ -221,54 +255,19 @@ msgstr "Nejsi přihlášenej"
 msgid "You are not allowed to access this page"
 msgstr "Nejste povolen na tuhle stránků"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "Žádna zadaná Captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-mail je už používán."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Jméno je už používáno."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Trvalo vám to příliš dlouho, zkuste znovu."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Nepodařila se vám captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Neznáma chyba Captcha"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
 msgid "This email provider is not allowed"
-msgstr "Tenhle dodavatel emailů tu není povolen"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Nepodařilo se udělat nové jméno :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Nepodařilo se vytvořit schůzi hned po registraci :("
-
+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"
@@ -286,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
@@ -304,12 +358,25 @@ 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."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+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"
@@ -324,10 +391,49 @@ 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"
+
+#: 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 příliš dlouho, zkuste znovu."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Nepodařila se vám 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é jméno :("
+
+#: 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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Země"
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:21
 msgid "Moon"
 msgstr "Měsíc"
@@ -342,7 +448,11 @@ msgstr "Coronavirus"
 
 #: src/canvasesDesc.js:24
 msgid "PixelZone"
+<<<<<<< HEAD
+msgstr "Pixelzone"
+=======
 msgstr "PixelZone"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:25
 msgid "PixelCanvas"
@@ -358,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
@@ -368,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) "
@@ -377,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."
 
@@ -384,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"
@@ -407,7 +539,7 @@ msgstr ""
 
 #: src/canvasesDesc.js:40
 msgid "Only four colors. Same rules as moon!"
-msgstr "Pouze 4 barvy. Stejná pravidla jako na měsíci!"
+msgstr "Pouze 4 barvy. Stejná pravidla jako na měsíci."
 
 #: src/canvasesDesc.js:41
 msgid ""
@@ -415,10 +547,24 @@ msgid ""
 "earth canvas!"
 msgstr ""
 "Obsaďte území na menší zemi s chráněným oceánem. Sděluje cooldown s plátnem "
-"země!"
+"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"
 
@@ -444,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,11 +122,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Placer farvede pixels på et kort-stilet kanvas med andre spillere online"
@@ -214,6 +236,10 @@ msgstr "Bekræft Nye Adgangskode"
 msgid "Submit"
 msgstr "Indsend"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Du er ikke bannet"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Du er ikke logget ind"
@@ -222,54 +248,107 @@ msgstr "Du er ikke logget ind"
 msgid "You are not allowed to access this page"
 msgstr "Du er ikke tilladt til at få adgang til denne side"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Kun administratorer kan gøre det"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Du er ikke bannet"
+#: 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/register.js:27
-msgid "No Captcha given"
-msgstr "Ingen Captcha angivet"
+<<<<<<< HEAD
+=======
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Du er nu bekræftet"
 
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-Mail allerede i brug."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Brugernavn allerede i brug."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Du tog for lang tid, prøv igen."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Du fejlede din captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
+#: 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/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Ukendt Captcha Fejl"
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Du er engang logget in."
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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 "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"
 
-#: src/routes/api/auth/register.js:92
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted Users can not do this."
+msgstr "Stummet brugere kan ikke gøre dette."
+
+#: 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"
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Ingen Captcha angivet"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-Mail allerede i brug."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Brugernavn allerede i brug."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Du tog for lang tid, prøv igen."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Du fejlede din captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Ukendt Captcha Fejl"
+
+#: src/routes/api/auth/register.js:89
 msgid "Failed to create new user :("
 msgstr "Kunne ikke oprette ny bruger :("
 
-#: src/routes/api/auth/register.js:108
+#: src/routes/api/auth/register.js:105
 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"
@@ -307,12 +386,12 @@ msgid "Incorrect password!"
 msgstr "Forkerte adgangskode!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
-msgstr "Stummet brugere kan ikke slette deres konto."
+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 "Stummet brugere kan ikke gøre dette."
+msgid "Muted users can not do this."
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -327,6 +406,8 @@ msgstr "Du vil blive automatisk omdirigeret efter 15s"
 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"
@@ -361,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
@@ -371,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) "
@@ -380,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"
@@ -408,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,11 +141,12 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Zeichne mit farbigen Pixel auf einer Weltkarte mit anderen Spielern"
 
@@ -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,6 +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"
@@ -220,54 +259,53 @@ msgstr "Du bist nicht angemeldet"
 msgid "You are not allowed to access this page"
 msgstr "Du hast keinen Zugriff zu diese Seite"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "Kein Captcha angegeben"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-Mail wird bereits verwendet."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Name wird bereits verwendet."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Du hast zu lange gebraucht, versuche es noch einmal."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Captcha Text ist falsch"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Unbekannter Captcha-Fehler"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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:92
+#: 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:108
+#: 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"
@@ -305,11 +343,23 @@ msgid "Incorrect password!"
 msgstr "Falsches Passwort!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+<<<<<<< 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."
+
+#: 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/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
@@ -325,6 +375,41 @@ 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"
+
+#: 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 gebraucht, 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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Erde"
@@ -360,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"
@@ -370,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) "
@@ -379,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"
@@ -407,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-dz.po

@@ -108,11 +108,11 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr ""
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 
@@ -202,6 +202,10 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr ""
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr ""
@@ -210,54 +214,10 @@ msgstr ""
 msgid "You are not allowed to access this page"
 msgstr ""
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr ""
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr ""
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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 ""
@@ -296,6 +256,10 @@ msgstr ""
 msgid "Muted Users can not delete their account."
 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/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr ""
@@ -313,6 +277,38 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+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 ""
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr ""

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,12 +141,13 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Metu kolorajn pikselojn en grandan kanvason kun alian ludantojn enrete"
 
@@ -215,6 +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"
@@ -225,56 +256,55 @@ msgstr "Vin eĉ ne ensalutita."
 msgid "You are not allowed to access this page"
 msgstr "Malhavas l' permes' je l' kanal'"
 
-#: src/routes/api/modtools.js:209
+#: 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 "Vi ne estas aŭtentigita."
 
-#: src/routes/api/auth/register.js:27
+#: 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:30
+#: src/routes/api/auth/register.js:34
 msgid "E-Mail already in use."
 msgstr "Retpostadreso jam uzata."
 
-#: src/routes/api/auth/register.js:32
+#: src/routes/api/auth/register.js:36
 msgid "Username already in use."
 msgstr "Uzantnomo jam uzata."
 
-#: src/routes/api/auth/register.js:55
+#: src/routes/api/auth/register.js:59
 msgid "You took too long, try again."
 msgstr ""
 
-#: src/routes/api/auth/register.js:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
 msgstr ""
 
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
 msgstr ""
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
+#: 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:108
+#: 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"
@@ -312,11 +342,23 @@ 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 ""
 
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -332,6 +374,42 @@ 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"
+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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "L' Mond'"
@@ -373,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
@@ -387,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"
@@ -394,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
@@ -415,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

@@ -2,36 +2,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-06-07 09:09+0000\n"
-"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/pixelplanet/"
-"server/es/>\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: es\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: Weblate 5.6-dev\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"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"
-msgstr "No se pueden enviar mensajes al chat mientras usas proxy"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+msgstr "No se pueden enviar mensajes de chat con proxy"
 
 #: src/core/ChatProvider.js:436
+#, fuzzy
 msgid "Your country is temporary muted from this chat channel"
-msgstr "Tu país está temporalmente silenciado de este chat"
+msgstr "Tu país está temporalmente silenciado en el chat"
 
 #: src/core/ChatProvider.js:439
 msgid "You are permanently muted, join our guilded to appeal the mute"
 msgstr "Estás silenciado permanentemente, únete a nuestro guilded para apelar"
 
 #: src/core/ChatProvider.js:441
+#, fuzzy
 msgid "You are banned"
-msgstr "Estás baneado"
+msgstr "No estás autenticado."
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
-msgstr "Tú proveedor de internet está baneado"
+msgstr ""
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
@@ -39,7 +45,7 @@ msgid "You are muted for another ${ timeMin } minutes"
 msgstr "Estás silenciado por ${ timeMin } minutos más"
 
 #: src/core/ChatProvider.js:450
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
 msgstr "Estás silenciado por ${ ttl } segundos más"
 
@@ -88,12 +94,14 @@ msgstr "El usuario no existe en la base de datos :("
 
 #: src/routes/reset_password.js:89
 msgid "Password successfully changed."
-msgstr "Se cambió la contraseña exitosamente."
+msgstr "Contraseña cambiada exitosamente."
 
 #: src/routes/reset_password.js:108
 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"
@@ -110,19 +118,39 @@ msgstr "Haz doble clic en el globo para regresar."
 msgid "Loading..."
 msgstr "Cargando..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
-msgstr "ppfun"
+msgstr ""
 
 #: src/ssr/PopUp.jsx:48
+#, fuzzy
 msgid "PixelPlanet.Fun PopUp"
-msgstr "Ventana emergente de PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
-msgstr "PixelPlanet.Fun"
+msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+#: 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"
 
@@ -151,8 +179,9 @@ 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 2 caracteres de largo"
+msgstr "El nombre debe tener al menos 4 caracteres de largo"
 
 #: src/utils/validation.js:31
 msgid "Name must be shorter than 26 characters"
@@ -166,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."
@@ -210,64 +291,85 @@ msgstr "Confirmar Contraseña Nueva"
 
 #: src/ssr/PasswordReset.jsx:65
 msgid "Submit"
-msgstr "Confirmar"
+msgstr "Enviar"
 
+<<<<<<< HEAD
 #: src/routes/api/modtools.js:53
+#, fuzzy
 msgid "You are not logged in"
-msgstr "No has iniciado sesión"
+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 permiso para acceder a esta página"
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr "Solo los administradores pueden hacer eso"
+msgstr "No tienes acceso a este canal"
 
+=======
 #: src/routes/api/baninfo.js:32
+#, fuzzy
 msgid "You are not banned"
-msgstr "No estás baneado"
+msgstr "No estás autenticado."
 
-#: src/routes/api/auth/register.js:27
+#: 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"
+
+>>>>>>> 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 proporcionó captcha"
+msgstr "No se envió ningún texto para el captcha"
 
-#: src/routes/api/auth/register.js:30
+#: 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:32
+#: 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:55
+#: src/routes/api/auth/register.js:59
 msgid "You took too long, try again."
-msgstr "Tardaste demasiado, inténtalo de nuevo."
+msgstr "Te tardaste demasiado, inténtalo de nuevo."
 
-#: src/routes/api/auth/register.js:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
-msgstr "Fallaste el captcha"
+msgstr ""
 
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr "Por favor, actualiza la página web"
-
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
-msgstr "Error de captcha desconocido"
+msgstr "Error de Captcha Desconocido"
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Este provedore de email no está permitido"
-
-#: src/routes/api/auth/register.js:92
+#: 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:108
+#: 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"
@@ -289,8 +391,9 @@ msgid "You are not even logged in."
 msgstr "Ni siquiera has iniciado sesión."
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
+#, fuzzy
 msgid "Server error when logging out."
-msgstr "Error del servidor al cerrar sesión."
+msgstr "Ocurrió un error al guardar"
 
 #: src/routes/api/auth/change_mail.js:44
 #: src/routes/api/auth/change_passwd.js:34
@@ -305,12 +408,24 @@ 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 "Los usuarios silenciados no pueden borrar sus cuentas."
+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/change_mail.js:62
 msgid "Muted Users can not do this."
-msgstr "Los usuarios silenciados no pueden hacer esto."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -325,6 +440,42 @@ 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"
+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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Tierra"
@@ -355,20 +506,25 @@ msgstr "1bit"
 
 #: src/canvasesDesc.js:27
 msgid "Top10"
-msgstr "Top10"
+msgstr ""
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
-msgstr "2bit"
+msgstr ""
 
 #: src/canvasesDesc.js:29
 msgid "Minimap"
-msgstr "Minimapa"
+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!"
+"Nuestro lienzo principal, un enorme mapa del mundo. Coloca donde quieras"
 
 #: src/canvasesDesc.js:33
 msgid ""
@@ -380,12 +536,22 @@ msgstr ""
 "1.5k píxeles."
 
 #: src/canvasesDesc.js:34
-msgid "Place Voxels on a 3D canvas with others."
-msgstr "Coloca vóxeles en un lienzo 3D junto a otros usuarios."
+<<<<<<< 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"
+
+#: src/canvasesDesc.js:35
+#, fuzzy
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-msgstr "Lienzo especial para crear conciencia sobre el virus SARS-CoV2."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+msgstr "Lienzo especial para crear conciencia sobre el virus SARS-CoV2"
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -404,20 +570,24 @@ msgid ""
 "A canvas for the most active players from the the previous day. Daily "
 "ranking updates at 00:00 UTC."
 msgstr ""
-"Un lienzo para los jugadores más activos del día anterior. El ranking diario "
-"se actualiza a las 00:00 UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
-msgstr "Solo cuatro colores. Mismas reglas que la luna!"
+>>>>>>> 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 ""
-"Conquista tierras en una pequeña tierra con los océanos protegidos. Comparte "
-"enfriamiento con la Tierra!"
 
 #: src/core/MailProvider.js:66
 #, javascript-format
@@ -490,7 +660,7 @@ msgstr ""
 
 #: src/core/MailProvider.js:114
 msgid "Mail is not configured on the server"
-msgstr "El mail no está configurado en el servidor"
+msgstr ""
 
 #: src/core/MailProvider.js:122
 msgid ""

i18n/ssr-et.po

@@ -114,11 +114,11 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Joonista piksleid maailmakaardile koos teiste inimestega"
 
@@ -208,6 +208,10 @@ msgstr "Kinnita Uus Salasõna"
 msgid "Submit"
 msgstr "Kinnita"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Sinu ligipääs ei ole piiratud"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Sa ei ole sisse logitud"
@@ -216,54 +220,10 @@ msgstr "Sa ei ole sisse logitud"
 msgid "You are not allowed to access this page"
 msgstr "Sul puudub sellele leheküljele ligipääs"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Ainult administraatorid saavad seda teha"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Sinu ligipääs ei ole piiratud"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha't ei antud"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Meil on juba kasutuses."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Nimi on juba kasutuses."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Sul läks liiga kaua, proovi uuesti."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Sa lahendasid captcha valesti"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Tundmatu Captcha Viga"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "See meiliaadress ei ole lubatud"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Uue kasutaja loomine ebaõnnestus :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Sessiooni loomine ebaõnnestus peale registreerumist :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Meili verifikatsioon"
@@ -304,6 +264,10 @@ msgstr "Vale salasõna!"
 msgid "Muted Users can not delete their account."
 msgstr "Vaigistatud Kasutajad ei saa oma kontot kustutada."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "See meiliaadress ei ole lubatud"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Vaigistatud Kasutajad ei saa seda teha."
@@ -321,6 +285,38 @@ msgstr "Sind suunatake automaatselt ümber 15 sekundi pärast"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Või ${ clickHere }, et minna tagasi pixelplanet'isse"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Captcha't ei antud"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Meil on juba kasutuses."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Nimi on juba kasutuses."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Sul läks liiga kaua, proovi uuesti."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Sa lahendasid captcha valesti"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Tundmatu Captcha Viga"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Uue kasutaja loomine ebaõnnestus :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Sessiooni loomine ebaõnnestus peale registreerumist :("
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Maa"

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,11 +121,30 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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 ""
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "پیکسل‌های رنگی را روی بوم طرح‌دار نقشه با دیگر بازیکنان آنلاین قرار دهید"
 
@@ -212,6 +234,10 @@ msgstr "رمز عبور جدید را تأیید کنید"
 msgid "Submit"
 msgstr "ارسال"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "تو بن نشدی"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "شما وارد نشده اید"
@@ -220,54 +246,15 @@ msgstr "شما وارد نشده اید"
 msgid "You are not allowed to access this page"
 msgstr "شما اجازه دسترسی به این صفحه را ندارید"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "فقط ادمین ها میتونن این کار رو بکنن"
 
+<<<<<<< HEAD
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "تو بن نشدی"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "کپچا داده نشده است"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "ایمیل در حال حاضر در حال استفاده است."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "نام کاربری در حال حاضر استفاده شده است."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "خیلی کار رو طولش دادی، دوباره امتحان کن."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "شما کپچای خود را اشتباه جواب دادین"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "کپچا یه خطایی داده که خودمم نمیدونم چیه"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "این ارائه دهنده ایمیل مجاز نیست"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "کاربر جدید ایجاد نشد :("
-
-#: src/routes/api/auth/register.js:108
-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 "تایید ایمیل"
@@ -307,6 +294,11 @@ 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"
+msgstr "این ارائه دهنده ایمیل مجاز نیست"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
@@ -325,6 +317,98 @@ msgstr "پس از 15 ثانیه به طور خودکار هدایت می شوی
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "یا ${ clickHere } تا به پیکسل پلنت برگردی"
 
+#: src/routes/api/auth/register.js:31
+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 "تشکیل جلسه پس از ثبت نام انجام نشد :("
+
+<<<<<<< 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 "زمین"
@@ -366,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 ""
 "بوم اصلی ما، نقشه عظیمی از جهان است. هر جایی که دوست دارید پیکسل قرار دهید"
 
@@ -380,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 را روی بوم سه بعدی با دیگران قرار دهید"
@@ -387,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
@@ -410,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-fi.po

@@ -115,11 +115,11 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Hauska ponnahdusikkuna"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Sijoita väripikseleitä karttatyyliselle kankaalle muiden pelaajien kanssa "
@@ -213,6 +213,10 @@ msgstr "Vahvista uusi salasanasi"
 msgid "Submit"
 msgstr "Lähetä"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Sinulla ei ole porttikieltoa"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Sinä et ole kirjautuneena"
@@ -221,54 +225,10 @@ msgstr "Sinä et ole kirjautuneena"
 msgid "You are not allowed to access this page"
 msgstr "Sinulla ei ole lupaa käyttää tätä sivua"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Vain järjestelmänvalvojat voivat tehdä noin"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Sinulla ei ole porttikieltoa"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Ei captcha annettu"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Sähköposti on jo käytössä"
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Käyttäjänimi on jo käytössä."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Sinulla kesti liian kauan, kokeile uudestaan."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Sinä epäonnistuit captchassasi"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Tuntematon Captcha Virhe"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Tämä sähköpostipalveluntarjoaja ei ole sallittu"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Käyttäjän luonti epäonnistunut:("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Istunnon perustaminen epäonnistui rekisteröinnin jälkeen :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Sähköpostin vahvistaminen"
@@ -309,6 +269,10 @@ msgstr ""
 msgid "Muted Users can not delete their account."
 msgstr ""
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Tämä sähköpostipalveluntarjoaja ei ole sallittu"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr ""
@@ -326,6 +290,38 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Ei captcha annettu"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Sähköposti on jo käytössä"
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Käyttäjänimi on jo käytössä."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Sinulla kesti liian kauan, kokeile uudestaan."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Sinä epäonnistuit captchassasi"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Tuntematon Captcha Virhe"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Käyttäjän luonti epäonnistunut:("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Istunnon perustaminen epäonnistui rekisteröinnin jälkeen :("
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr ""

i18n/ssr-fr.po

@@ -2,20 +2,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-04-23 16:07+0000\n"
-"Last-Translator: Sylvain <sylvainstein@pxlplanet.be>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/pixelplanet/"
-"server/fr/>\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: fr\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: Weblate 5.5-dev\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"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
@@ -36,7 +39,7 @@ msgstr "Vous n'êtes pas autorisé."
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
-msgstr "Votre FAI est banni"
+msgstr ""
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
@@ -99,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"
@@ -115,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 ""
@@ -124,12 +146,13 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Placez des pixels colorés sur une carte du monde en ligne avec d'autres "
@@ -222,66 +245,78 @@ 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/modtools.js:65
-#, fuzzy
-msgid "You are not allowed to access this page"
-msgstr "Vous n'avez pas accès à ce salon"
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr ""
-
+=======
 #: src/routes/api/baninfo.js:32
 #, fuzzy
 msgid "You are not banned"
 msgstr "Vous n'êtes pas autorisé."
 
-#: src/routes/api/auth/register.js:27
+#: src/routes/api/modtools.js:53
+#, fuzzy
+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"
+msgstr "Vous n'avez pas accès à ce salon"
+
+#: 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 "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:30
+#: 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:32
+#: 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:55
+#: 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:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
 msgstr "Vous avez échoué votre captcha"
 
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
 msgstr "Erreur de captcha inconnue"
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Ce fournisseur d'email n'est pas autorisé"
-
-#: src/routes/api/auth/register.js:92
+#: 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:108
+#: 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"
@@ -320,12 +355,24 @@ 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 "Les utilisateurs mis en sourdine ne peuvent pas supprimer leur compte."
+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/change_mail.js:62
 msgid "Muted Users can not do this."
-msgstr "Cette action n'est pas disponible aux utilisateurs mis en sourdine."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -340,6 +387,42 @@ 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"
+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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "La terre"
@@ -381,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"
 
@@ -396,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"
@@ -403,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
@@ -422,20 +517,24 @@ msgid ""
 "A canvas for the most active players from the the previous day. Daily "
 "ranking updates at 00:00 UTC."
 msgstr ""
-"Une toile pour les joueurs les plus actifs de la veille. Le classement "
-"journalier est mis à jour à minuit UTC."
 
 #: src/canvasesDesc.js:40
+<<<<<<< HEAD
+msgid "Only four colors. Same rules as moon."
+=======
 msgid "Only four colors. Same rules as moon!"
-msgstr "Seulement 4 couleurs. Même règles que pour la lune !"
+>>>>>>> 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 ""
-"Conquérir des territoires sur une version plus petite de la Terre où les "
-"océans sont protégés. Le temps de recharge est partagé avec la Terre !"
 
 #: src/core/MailProvider.js:66
 #, javascript-format

i18n/ssr-frc.po

@@ -1,475 +0,0 @@
-msgid ""
-msgstr ""
-"Language: frc\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-
-#: src/core/ChatProvider.js:434
-msgid "You can not send chat messages while using a 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
-msgid "You are banned"
-msgstr ""
-
-#: src/core/ChatProvider.js:443
-msgid "Your Internet Provider is banned"
-msgstr ""
-
-#: 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
-msgid "Your mail has to be verified in order to chat"
-msgstr ""
-
-#: 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
-msgid "Your passwords do not match :("
-msgstr ""
-
-#: src/routes/reset_password.js:77
-msgid "User doesn't exist in our database :("
-msgstr ""
-
-#: src/routes/reset_password.js:89
-msgid "Password successfully changed."
-msgstr ""
-
-#: src/routes/reset_password.js:108
-msgid "Invalid url :( Please check your mail again."
-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 ""
-
-#: src/ssr/Globe.jsx:52
-msgid "Loading..."
-msgstr ""
-
-#: src/ssr/PopUp.jsx:47
-msgid "ppfun"
-msgstr ""
-
-#: src/ssr/PopUp.jsx:48
-msgid "PixelPlanet.Fun PopUp"
-msgstr ""
-
-#: src/ssr/Main.jsx:68
-msgid "PixelPlanet.Fun"
-msgstr ""
-
-#: src/ssr/Main.jsx:69
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-
-#: src/utils/validation.js:17
-msgid "Email can't be empty."
-msgstr ""
-
-#: src/utils/validation.js:18
-msgid "Email should be at least 5 characters long."
-msgstr ""
-
-#: src/utils/validation.js:19
-msgid "Email can't be longer than 40 characters."
-msgstr ""
-
-#: 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 ""
-
-#: src/utils/validation.js:29
-msgid "Name can't be empty."
-msgstr ""
-
-#: src/utils/validation.js:30
-msgid "Name must be at least 2 characters long"
-msgstr ""
-
-#: src/utils/validation.js:31
-msgid "Name must be shorter than 26 characters"
-msgstr ""
-
-#: src/utils/validation.js:38
-msgid "Name contains invalid character like @, /, \\ or #"
-msgstr ""
-
-#: src/utils/validation.js:53
-msgid "No password given."
-msgstr ""
-
-#: src/utils/validation.js:56
-msgid "Password must be at least 6 characters long."
-msgstr ""
-
-#: src/utils/validation.js:59
-msgid "Password must be shorter than 60 characters."
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
-msgid "PixelPlanet.fun Password Reset"
-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
-msgid "Reset Password"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
-msgid "Click here"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:30
-msgid "to go back to pixelplanet"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:50
-#, javascript-format
-msgid "Hello ${ name }, you can set your new password here:"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:54
-msgid "New Password"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:60
-msgid "Confirm New Password"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:65
-msgid "Submit"
-msgstr ""
-
-#: src/routes/api/modtools.js:53
-msgid "You are not logged in"
-msgstr ""
-
-#: src/routes/api/modtools.js:65
-msgid "You are not allowed to access this page"
-msgstr ""
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr ""
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr ""
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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
-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 ""
-
-#: 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
-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 anywhere 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
-msgid "Place Voxels on a 3D canvas with others."
-msgstr ""
-
-#: src/canvasesDesc.js:35
-msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-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
-msgid ""
-"We already sent you a mail with instructions. Please wait before requesting "
-"another mail."
-msgstr ""
-
-#: src/core/MailProvider.js:130
-msgid "Couldn't find this mail in our database"
-msgstr ""

i18n/ssr-ga.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-05-14 19:42+0000\n"
-"Last-Translator: FOXHELL <foxhell768@gmail.com>\n"
+"PO-Revision-Date: 2024-04-02 18:53+0000\n"
+"Last-Translator: Jamie Fitzgerald <jamiefitzgerald2010@gmail.com>\n"
 "Language-Team: Irish <https://hosted.weblate.org/projects/pixelplanet/server/"
 "ga/>\n"
 "Language: ga\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
 "(n>6 && n<11) ? 3 : 4;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
@@ -118,11 +118,11 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "Pixelplanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Cuir picteilíní dathuil ar canbháis cosúil le léarscáil le daoine eile ar "
@@ -204,7 +204,7 @@ msgstr "Heileo ${ name }, Is féidir leat phasfhocal nua a cuir anseo:"
 
 #: src/ssr/PasswordReset.jsx:54
 msgid "New Password"
-msgstr "Phasfhocal Nua"
+msgstr "Phasfhocal nua"
 
 #: src/ssr/PasswordReset.jsx:60
 msgid "Confirm New Password"
@@ -214,6 +214,10 @@ msgstr "deimhnigh n phasfhocal nua"
 msgid "Submit"
 msgstr "Cuir isteach"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Níl cosc ort"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Níl tú logáilte isteach"
@@ -222,54 +226,10 @@ msgstr "Níl tú logáilte isteach"
 msgid "You are not allowed to access this page"
 msgstr "Níl cead agat teacht ar an leathanach seo"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Ní féidir ach Riarthóirí sin a dhéanamh"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Níl cosc ort"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Níl Captcha ar fail"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Tá an Ríomhphost sin in úsáid."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Ta an Ainm úsáideora sin in úsáid cheana féin."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Ghlac to raibh fhada, Tráil Arís."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Theip ort don Captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Earráid Captcha Nach bhfuil are eolas"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Níl cead tugtha ar an Soláthraí Ríomhphost sin"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Theip le úsáideoir nua a cruthú:("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Theip chun seisiún a bhunú I ndiaidh an cláraigh :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Fíorú phost"
@@ -311,6 +271,10 @@ msgid "Muted Users can not delete their account."
 msgstr ""
 "Ní féidir le Úsáideoirí le balbh orthu scrios a chuir ar cuntas sacadh."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Níl cead tugtha ar an Soláthraí Ríomhphost sin"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Ní féidir le úsáideoirí le balbh orthu seo a dhéanamh."
@@ -328,6 +292,38 @@ msgstr "Beidh tú a atreorú go huathoibríoch tar éis 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Nó ${ clickHere } chun dul ar ais go pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Níl Captcha ar fail"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Tá an Ríomhphost sin in úsáid."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Ta an Ainm úsáideora sin in úsáid cheana féin."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Ghlac to raibh fhada, Tráil Arís."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Theip ort don Captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Earráid Captcha Nach bhfuil are eolas"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Theip le úsáideoir nua a cruthú:("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Theip chun seisiún a bhunú I ndiaidh an cláraigh :("
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Domhan"

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,11 +125,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Τοποθετήστε έγχρωμα pixel σε έναν μεγάλο καμβά με άλλους παίκτες στο "
@@ -219,6 +241,10 @@ msgstr "Επιβεβαιώστε τον καινούριο σας κωδικό"
 msgid "Submit"
 msgstr "Yπέβαλλε"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Δεν είσαι απαγορευμένος"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Δεν είσται συνδεμένοι"
@@ -227,54 +253,15 @@ msgstr "Δεν είσται συνδεμένοι"
 msgid "You are not allowed to access this page"
 msgstr "Δεν επιτρέπεται η πρόσβαση σε αυτή τη σελίδα"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Μόνο οι διαχειριστές μπορούν να το κάνουν αυτό"
 
+<<<<<<< HEAD
 #: src/routes/api/baninfo.js:32
 msgid "You are not banned"
 msgstr "Δεν είσαι απαγορευμένος"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Δεν δόθηκε αναγνωριστικό captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Email είναι ήδη σε χρήση."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Το όνομα χρήστη χρησιμοποιείται ήδη."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Χρειάστηκε πολύς χρόνος, δοκιμάστε ξανά."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Απέτυχες το captcha σου"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Άγνωστο σφάλμα Captcha"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Αυτός ο πάροχος email δεν επιτρέπεται"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Αποτυχία δημιουργίας νέου χρήστη :("
-
-#: src/routes/api/auth/register.js:108
-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 "Επαλήθευση mail"
@@ -314,6 +301,11 @@ 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"
+msgstr "Αυτός ο πάροχος email δεν επιτρέπεται"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
@@ -332,6 +324,98 @@ msgstr "Θα ανακατευθυνθείτε αυτόματα μετά από 1
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Ή ${ clickHere } για να επιστρέψετε στο pixelplanet"
 
+#: 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 "Email είναι ήδη σε χρήση."
+
+#: 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 "Απέτυχε η δημιουργία συνεδρίας μετά την εγγραφή :("
+
+<<<<<<< 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"
@@ -373,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 ""
 "Ο κύριος καμβάς μας, ένας τεράστιος χάρτης του κόσμου. Τοποθετήστε όπου "
 "θέλετε"
@@ -388,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 σε έναν τρισδιάστατο καμβά μαζί με άλλους"
@@ -395,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
@@ -418,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"
-"PO-Revision-Date: 2024-06-10 20:09+0000\n"
-"Last-Translator: Milo Ivir <mail@milotype.de>\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.6-dev\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,11 +133,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Postavite piksele u boji na platno u stilu karte s drugim igračima na mreži"
@@ -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
@@ -214,6 +256,10 @@ msgstr "Potvrdi novu lozinku"
 msgid "Submit"
 msgstr "Podnesi"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Niste banani"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Niste ulogirani"
@@ -222,54 +268,16 @@ msgstr "Niste ulogirani"
 msgid "You are not allowed to access this page"
 msgstr "Nije vam dopušten pristup ovoj stranici"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "Nije data Captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Email adresa je već u uporabi."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Korisničko ime se već koristi."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Predugo vam je trebalo, pokušajte ponovno."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Pogrešio si s captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr "Osvježi web stranicu"
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Nepoznata Captcha pogreška"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Ovaj pružatelj usluge e-pošte nije dopušten"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Nije uspjelo stvaranje novog korisnika :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Nije uspjelo uspostavljanje sesije nakon registracije :("
+msgstr "Niste banani."
 
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Provjera pošte"
@@ -309,6 +317,11 @@ 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"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Utišani korisnici to ne mogu učiniti."
@@ -326,6 +339,97 @@ msgstr "Bit ćete automatski preusmjereni nakon 15 s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Ili ${ clickHere } da se vratite na pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Nije data Captcha"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Email adresa je već u uporabi."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Korisničko ime se već koristi."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Predugo vam je trebalo, pokušajte ponovno."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Pogrešio si s captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Nepoznata Captcha pogreška"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Nije uspjelo stvaranje novog korisnika :("
+
+#: src/routes/api/auth/register.js:105
+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"
@@ -360,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
@@ -386,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"
@@ -407,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
@@ -434,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"
@@ -477,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,11 +136,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun felugró"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Helyezz el pixeleket egy hatalmas online vásznon más játékosokkal együtt"
@@ -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."
@@ -214,6 +254,10 @@ msgstr "Új jelszó megerősítése"
 msgid "Submit"
 msgstr "Küldés"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Nem vagy kitiltva"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Nem vagy bejelentkezve"
@@ -222,54 +266,106 @@ msgstr "Nem vagy bejelentkezve"
 msgid "You are not allowed to access this page"
 msgstr "Nincs hozzáférésed ehhez az oldalhoz"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Ezt csak az adminok tehetik meg"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Nem vagy kitiltva"
+#: 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/register.js:27
-msgid "No Captcha given"
-msgstr "Nincs Captcha megadva"
+<<<<<<< HEAD
+=======
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Mostantól hitelesített vagy :)"
 
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Az e-mail cím már foglalt."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "A felhasználónév már foglalt."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Túl sokáig próbáltad, próbáld újra."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Nem sikerült a captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
+#: 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/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Ismeretlen captcha hiba"
+#: 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/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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."
+
+>>>>>>> 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"
 
-#: src/routes/api/auth/register.js:92
+#: 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"
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Nincs Captcha megadva"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Az e-mail cím már foglalt."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "A felhasználónév már foglalt."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Túl sokáig próbáltad, próbáld újra."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Nem sikerült a captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Ismeretlen captcha hiba"
+
+#: src/routes/api/auth/register.js:89
 msgid "Failed to create new user :("
 msgstr "Nem sikerült új felhasználót létrehozni :("
 
-#: src/routes/api/auth/register.js:108
+#: src/routes/api/auth/register.js:105
 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"
@@ -306,11 +402,11 @@ msgid "Incorrect password!"
 msgstr "Hibás jelszó!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+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."
+msgid "Muted users can not do this."
 msgstr "A némított felhasználók nem tehetik meg ezt."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -326,6 +422,8 @@ msgstr "Automatikusan átirányítunk 15 másodperc múlva"
 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"
@@ -367,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 ""
@@ -380,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"
@@ -408,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
@@ -118,16 +182,36 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun-ի ելնող պատուհան"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 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,8 +305,71 @@ 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
+msgid "You are not banned"
+msgstr "Դուք արգելված չեք"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Դուք մուտք չեք գործել"
@@ -220,53 +378,10 @@ msgstr "Դուք մուտք չեք գործել"
 msgid "You are not allowed to access this page"
 msgstr "Ձեզ չի թույլատրվում մուտք գործել այս էջը"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Միայն ադմինները կարող են դա անել"
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Դուք արգելված չեք"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha չի տրվել"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Այս փոստը արդեն օգտագործվում է."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Այս անունը արդեն զբաղված է."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Շատ երկար էր, նորից փորձեք:"
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Դուք ձեր captcha-ն ձախողեցիք"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Captcha-ի Անհայտ Սխալ"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Այս էլփոստի մատակարարը չի թույլատրվում"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Չհաջողվեց ստեղծել նոր օգտվող :("
-
-#: src/routes/api/auth/register.js:108
-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"
@@ -290,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
@@ -305,12 +424,25 @@ 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 "Լռեցված օգտատերերը չեն կարող ջնջել իրենց հաշիվը:"
 
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Լռեցված օգտատերերը չեն կարող դա անել:"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -325,6 +457,41 @@ 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 չի տրվել"
+
+#: 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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Երկիր"
@@ -355,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
@@ -372,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 պիքսելից մեծ արվեստ:"
 
@@ -390,6 +594,7 @@ msgstr "Հատուկ կտավ `SARS-CoV2- ի իրազեկությունը տար
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
 msgstr "ՊիքսելԳոտի-ի հայելին"
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 
 #: src/canvasesDesc.js:37
 msgid "Mirror of PixelCanvas"
@@ -404,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
@@ -435,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 "Սեղմեք ՝ Ստուգելու համար"
+=======
 "Բարի գալուստ մեր պիքսել տեափղադրողների փոքրիկ համայնք, ձեր հաշիվն "
 "օգտագործելու համար դուք պետք է հաստատեք ձեր փոստը: Դուք կարող եք դա անել "
 "այստեղ՝ "
@@ -442,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:"
@@ -450,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"
@@ -463,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"
@@ -478,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
@@ -487,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 ""
@@ -500,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

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-06-12 10:12+0000\n"
-"Last-Translator: Aurter Ozturk <aurterozturk@gmail.com>\n"
+"PO-Revision-Date: 2024-03-16 21:26+0000\n"
+"Last-Translator: PotRapid <pvprealminecraft@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/it/>\n"
 "Language: it\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 #, fuzzy
@@ -30,7 +30,7 @@ msgstr ""
 
 #: src/core/ChatProvider.js:441
 msgid "You are banned"
-msgstr "Sei bannato"
+msgstr "Sei bannato, vai a parlare con donne vere"
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
@@ -70,7 +70,7 @@ msgstr "Per favore usa il canale \"int\". Letteralmente 1984"
 
 #: src/core/ChatProvider.js:512
 msgid "Stop flooding."
-msgstr "Manda messaggi più lentamente."
+msgstr "Manda messaggi più lentamente, sarai mica un turco"
 
 #: src/routes/reset_password.js:39
 msgid "You sent an empty password or invalid data :("
@@ -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,11 +123,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Piazza pixel colorati in un canvas con altri player online"
 
@@ -214,6 +236,10 @@ msgstr "Conferma nuova password"
 msgid "Submit"
 msgstr "Manda"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Non sei bannato (purtroppo)"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Non hai effettuato l'accesso"
@@ -222,54 +248,107 @@ msgstr "Non hai effettuato l'accesso"
 msgid "You are not allowed to access this page"
 msgstr "Non hai il permasso di accedere a questa pagina"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Solo gli admin possono farlo"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Non sei bannato (purtroppo)"
+#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
+msgid "Mail verification"
+msgstr "Verificazione mail"
 
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Nessun captcha dato"
+<<<<<<< HEAD
+=======
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Adesso sei verificato"
 
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Email già in uso"
+#: 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/register.js:32
-msgid "Username already in use."
-msgstr "Username già in uso"
+#: 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/register.js:55
-msgid "You took too long, try again."
-msgstr "Ci hai messo troppo, riprova"
+#: 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/register.js:58
-msgid "You failed your captcha"
-msgstr "Hai sbagliato il captcha"
+#: 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/register.js:61
-msgid "Please refresh the website"
-msgstr "Aggiorna il sito web"
+#: 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/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Errore del captcha sconosciuto"
+#: src/routes/api/auth/delete_account.js:46
+msgid "Muted Users can not delete their account."
+msgstr "Un account mutato non puo essere eliminato"
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+>>>>>>> 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"
 
-#: src/routes/api/auth/register.js:92
+#: src/routes/api/auth/change_mail.js:62
+msgid "Muted Users can not do this."
+msgstr "una persona mutata non puo fare quello che stai facendo, smettila!"
+
+#: 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"
+
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Nessun captcha dato"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Email già in uso"
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Username già in uso"
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Ci hai messo troppo, riprova"
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Hai sbagliato il captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Errore del captcha sconosciuto"
+
+#: src/routes/api/auth/register.js:89
 msgid "Failed to create new user :("
 msgstr "Fallimento nel creare un nuovo user"
 
-#: src/routes/api/auth/register.js:108
+#: src/routes/api/auth/register.js:105
 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"
@@ -307,12 +386,12 @@ msgid "Incorrect password!"
 msgstr "Password incorretta"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
-msgstr "Un account mutato non puo essere eliminato"
+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 "una persona mutata non puo fare quello che stai facendo, smettila!"
+msgid "Muted users can not do this."
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
@@ -327,6 +406,8 @@ msgstr "Sarai rediretto automaticamente dopo 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "o ${ clickHere } per tornare su pixelplanet"
 
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Terra"
@@ -368,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"
@@ -383,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"
@@ -390,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
@@ -413,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,11 +136,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "განათავსეთ ფერადი პიქსელები რუკის კანვასზე ტილოზე სხვა მოთამაშეებთან ერთად "
@@ -216,6 +251,10 @@ msgstr "Დაადასტურეთ ახალი პაროლი"
 msgid "Submit"
 msgstr "გაგზავნა"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "არ ხარ აკრძალული"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "თქვენ არ ხართ შესული"
@@ -224,58 +263,16 @@ msgstr "თქვენ არ ხართ შესული"
 msgid "You are not allowed to access this page"
 msgstr "თქვენ არ გაქვთ უფლება შეხვიდეთ ამ გვერდზე"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "ამის გაკეთება მხოლოდ ადმინებს შეუძლიათ"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "არ ხარ აკრძალული"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "კაპჩა არ არის მოცემული"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Ელექტრონული ფოსტა უკვე გამოყენებულია."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Მომხმარებლის სახელი უკვე გამოიყენება."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "ძალიან დიდი დრო დაგჭირდათ, ისევ სცადეთ."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "თქვენ ვერ მოახერხეთ თქვენი კაპტჩა"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "უცნობი კაპჩტას შეცდომა"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "ელფოსტის ეს პროვაიდერი დაუშვებელია"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "ახალი მომხმარებლის შექმნა ვერ მოხერხდა :("
-
-#: src/routes/api/auth/register.js:108
-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 "ფოსტის გადამოწმება"
 
+<<<<<<< HEAD
+=======
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
 msgstr "ახლა დამოწმებული ხარ :)"
@@ -313,6 +310,11 @@ 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 "ელფოსტის ეს პროვაიდერი დაუშვებელია"
+
 #: src/routes/api/auth/change_mail.js:62
 #, fuzzy
 msgid "Muted Users can not do this."
@@ -331,6 +333,98 @@ msgstr "თქვენ ავტომატურად გადამის
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "ან ${ clickHere } pixelplanet-ზე დასაბრუნებლად"
 
+#: src/routes/api/auth/register.js:31
+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 "რეგისტრაციის შემდეგ სესიის დამყარება ვერ მოხერხდა :("
+
+<<<<<<< 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 "დედამიწა"
@@ -365,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
@@ -374,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 ""
 "ჩვენი მთავარი კანვასი, მსოფლიოს უზარმაზარი რუკა. განათავსეთ ყველგან, სადაც "
 "გსურთ"
@@ -388,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 ტილოზე სხვებთან ერთად"
@@ -395,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
@@ -418,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 ფერი. იგივე წესები რაც მთვარეზეა."
@@ -433,6 +559,7 @@ msgstr ""
 
 #: src/core/MailProvider.js:66
 #, javascript-format
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
 msgstr ""
 "მოგესალმებით ${ name } PixelPlanet-ში, გთხოვთ, გადაამოწმოთ თქვენი ფოსტა"
@@ -460,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

@@ -2,16 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-04-15 08:17+0000\n"
-"Last-Translator: Legenda Tochno <tochnolegenda8@gmail.com>\n"
-"Language-Team: Kazakh <https://hosted.weblate.org/projects/pixelplanet/"
-"server/kk/>\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Fontan 030 <pomanfedurin@gmail.com>\n"
+"Language-Team: \n"
 "Language: kk\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: Weblate 5.5-dev\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: src/core/ChatProvider.js:434
 #, fuzzy
@@ -96,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-глобусы"
@@ -112,6 +113,7 @@ msgstr "Оралу үшін глобусқа екі рет басыңыз."
 msgid "Loading..."
 msgstr "Жүктелуде..."
 
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
 msgstr "ppfun"
@@ -120,11 +122,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun қалқымалы терезесі"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Басқа желідегі ойыншылармен бірге түрлі-түсті пикселдерді карта стиліндегі "
@@ -216,6 +237,10 @@ msgstr "Жаңа құпиясөзді растау"
 msgid "Submit"
 msgstr "Жіберу"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Сіз бұғаттауда емессіз"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Кірмегенсіз"
@@ -224,54 +249,107 @@ msgstr "Кірмегенсіз"
 msgid "You are not allowed to access this page"
 msgstr "Бұл бетті көруге рұқсатыңыз жоқ"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Мына әрекетті әкімшілер ғана жасай алады"
 
-#: 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 "Эл. пошта растау"
 
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha берілмеген"
+<<<<<<< HEAD
+=======
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Енді сіз расталғансыз :)"
 
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-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/register.js:32
-msgid "Username already in use."
-msgstr "Бұл қолданушы атын біреу алып қойған."
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Сіз тіпті жүйеге кірмедіңіз."
 
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-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/register.js:58
-msgid "You failed your captcha"
-msgstr "Captcha-ны шешпедіңіз"
+#: 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/register.js:61
-msgid "Please refresh the website"
+#: 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/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Белгісіз Captcha қатесі"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: 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:92
+#: 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 }"
+
+#: 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:108
+#: src/routes/api/auth/register.js:105
 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 "Эл. пошта растау"
@@ -309,11 +387,11 @@ msgid "Incorrect password!"
 msgstr "Құпиясөз дұрыс емес!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+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 do this."
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -329,6 +407,8 @@ msgstr "15 секундтан кейін сізді автоматты түрд
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Немесе pixelplanet-ке оралу үшін ${ clickHere }"
 
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Жер"
@@ -370,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
@@ -384,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-кенепке салыңыз"
@@ -391,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
@@ -414,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-kmr.po

@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-04-15 08:17+0000\n"
-"Last-Translator: FOXHELL <foxhell768@gmail.com>\n"
-"Language-Team: Toki Pona <https://hosted.weblate.org/projects/pixelplanet/"
-"server/tok/>\n"
-"Language: tok\n"
+"PO-Revision-Date: 2024-03-11 18:57+0000\n"
+"Last-Translator: Şêr kuh <buzaarq@gmail.com>\n"
+"Language-Team: Kurdish (Northern) <https://hosted.weblate.org/projects/"
+"pixelplanet/server/kmr/>\n"
+"Language: kmr\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
@@ -113,11 +113,11 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr ""
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 
@@ -207,6 +207,10 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr ""
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr ""
@@ -215,54 +219,10 @@ msgstr ""
 msgid "You are not allowed to access this page"
 msgstr ""
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr ""
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr ""
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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 ""
@@ -301,6 +261,10 @@ msgstr ""
 msgid "Muted Users can not delete their account."
 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/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr ""
@@ -318,13 +282,45 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+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 "Te pir dirêj kir, careke din biceribîne."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Te captcha xwe bi ser neket"
+
+#: 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 ""
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr ""
 
 #: src/canvasesDesc.js:21
 msgid "Moon"
-msgstr "mun"
+msgstr ""
 
 #: src/canvasesDesc.js:22
 msgid "3D Canvas"

i18n/ssr-ku.po

@@ -1,506 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2024-04-29 11:08+0000\n"
-"Last-Translator: Ahmed kurdish <nikogaming500@gmail.com>\n"
-"Language-Team: Kurdish (Northern) <https://hosted.weblate.org/projects/"
-"pixelplanet/server/kmr/>\n"
-"Language: kmr\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5.2\n"
-
-#: src/core/ChatProvider.js:434
-msgid "You can not send chat messages while using a proxy"
-msgstr "Dema ku hûn proxy bikar tînin hûn nikarin peyamên chatê bişînin"
-
-#: src/core/ChatProvider.js:436
-msgid "Your country is temporary muted from this chat channel"
-msgstr "Welatê we ji vê kanala sohbetê re demkî ye"
-
-#: src/core/ChatProvider.js:439
-msgid "You are permanently muted, join our guilded to appeal the mute"
-msgstr ""
-"Hûn bi domdarî bêdeng in, beşdarî komeleya me bibin ku îtîraza lalbûnê bikin"
-
-#: src/core/ChatProvider.js:441
-msgid "You are banned"
-msgstr "Tu qedexe yî"
-
-#: src/core/ChatProvider.js:443
-msgid "Your Internet Provider is banned"
-msgstr "Pêşkêşkara Înternetê ya we qedexe ye"
-
-#: src/core/ChatProvider.js:448
-#, javascript-format
-msgid "You are muted for another ${ timeMin } minutes"
-msgstr "Hûn ji bo ${timeMin } deqîqeyên din têne bêdeng kirin"
-
-#: src/core/ChatProvider.js:450
-#, javascript-format
-msgid "You are muted for another ${ ttl } seconds"
-msgstr "Tu ji bo ${ ttl } çirkeyên din bê deng bûyî"
-
-#: src/core/ChatProvider.js:467
-#, javascript-format
-msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
-msgstr "Tu pir bi lez mesajan dişînî, divê tu li benda ${ waitTime } bimînî :("
-
-#: src/core/ChatProvider.js:471
-msgid "You don't have access to this channel"
-msgstr "Tu bigihîjî vê kanalê"
-
-#: src/core/ChatProvider.js:490
-msgid "Your mail has to be verified in order to chat"
-msgstr "Ji bo sohbetê divê nameya we were verast kirin"
-
-#: src/core/ChatProvider.js:500
-msgid "You can't send a message this long :("
-msgstr "Tu nikarî evqas dirêj peyamekê bişînî :("
-
-#: src/core/ChatProvider.js:504
-msgid "Please use int channel"
-msgstr "Ji kerema xwe kanala int bikar bînin"
-
-#: src/core/ChatProvider.js:512
-msgid "Stop flooding."
-msgstr "lehî rawestandin."
-
-#: src/routes/reset_password.js:39
-msgid "You sent an empty password or invalid data :("
-msgstr "Te şîfreyek vala şand an daneya nederbasdar :("
-
-#: src/routes/reset_password.js:51
-msgid "This password-reset link isn't valid anymore :("
-msgstr "Ev lînka vesazkirina şîfreyê êdî ne derbasdar e :("
-
-#: src/routes/reset_password.js:62
-msgid "Your passwords do not match :("
-msgstr "Şîfreyên te hev nagirin :("
-
-#: src/routes/reset_password.js:77
-msgid "User doesn't exist in our database :("
-msgstr "Bikarhêner di databasa me de tune :("
-
-#: src/routes/reset_password.js:89
-msgid "Password successfully changed."
-msgstr "Şîfre bi serkeftî hate guhertin."
-
-#: src/routes/reset_password.js:108
-msgid "Invalid url :( Please check your mail again."
-msgstr "url nederbasdar :( Ji kerema xwe dîsa mail xwe kontrol bikin."
-
-#: src/ssr/Globe.jsx:37
-msgid "PixelPlanet.Fun 3DGlobe"
-msgstr "PixelPlanet.Fun 3DGlob"
-
-#: src/ssr/Globe.jsx:38
-msgid "A 3D globe of our whole map"
-msgstr "Cîhaneke 3D a tevahiya nexşeya me"
-
-#: src/ssr/Globe.jsx:51
-msgid "Double click on globe to go back."
-msgstr "Ji bo vegerê du caran li ser cîhanê bikirtînin."
-
-#: src/ssr/Globe.jsx:52
-msgid "Loading..."
-msgstr "Bar dike..."
-
-#: src/ssr/PopUp.jsx:47
-msgid "ppfun"
-msgstr "ppfun"
-
-#: src/ssr/PopUp.jsx:48
-msgid "PixelPlanet.Fun PopUp"
-msgstr "PixelPlanet.Fun Daxwazker"
-
-#: src/ssr/Main.jsx:68
-msgid "PixelPlanet.Fun"
-msgstr "PixelPlanet.Fun"
-
-#: src/ssr/Main.jsx:69
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-"Pîkselên rengîn bi lîstikvanên din ên serhêl re li ser nexşeyek şêwazê "
-"nexşeyê bi cîh bikin"
-
-#: src/utils/validation.js:17
-msgid "Email can't be empty."
-msgstr "E-peyam ne vala ye."
-
-#: src/utils/validation.js:18
-msgid "Email should be at least 5 characters long."
-msgstr "E-name divê herî kêm 5 tîpan be."
-
-#: src/utils/validation.js:19
-msgid "Email can't be longer than 40 characters."
-msgstr "E-name nikare ji 40 tîpan dirêjtir be."
-
-#: src/utils/validation.js:20
-msgid "Email should at least contain a dot"
-msgstr "Divê e-mail bi kêmanî xalek hebe"
-
-#: src/utils/validation.js:22
-msgid "Email should contain a @"
-msgstr "Divê e-mail navnîşek @ hebe"
-
-#: src/utils/validation.js:29
-msgid "Name can't be empty."
-msgstr "Nav vala nabe."
-
-#: src/utils/validation.js:30
-msgid "Name must be at least 2 characters long"
-msgstr "Divê nav bi kêmanî 2 tîpan dirêj be"
-
-#: src/utils/validation.js:31
-msgid "Name must be shorter than 26 characters"
-msgstr "Divê nav ji 26 tîpan kurttir be"
-
-#: src/utils/validation.js:38
-msgid "Name contains invalid character like @, /, \\ or #"
-msgstr "Navê tîpan nederbasdar e wek @, /, \\ an #"
-
-#: src/utils/validation.js:53
-msgid "No password given."
-msgstr "Tu şîfre nehat dayîn."
-
-#: src/utils/validation.js:56
-msgid "Password must be at least 6 characters long."
-msgstr "Divê şîfre herî kêm 6 tîpan be."
-
-#: src/utils/validation.js:59
-msgid "Password must be shorter than 60 characters."
-msgstr "Divê şîfre ji 60 tîpan kurttir be."
-
-#: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
-msgid "PixelPlanet.fun Password Reset"
-msgstr "PixelPlanet.fun Şîfre Vegere"
-
-#: src/ssr/PasswordReset.jsx:21 src/ssr/PasswordReset.jsx:41
-msgid "Reset your password here"
-msgstr "Şîfreya xwe li vir vegerîne"
-
-#: src/core/MailProvider.js:105 src/ssr/PasswordReset.jsx:28
-#: src/ssr/PasswordReset.jsx:49
-msgid "Reset Password"
-msgstr "Şîfreyê Vegerîne"
-
-#: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
-msgid "Click here"
-msgstr "Li vir bitikîne"
-
-#: src/ssr/PasswordReset.jsx:30
-msgid "to go back to pixelplanet"
-msgstr "da ku vegerin ser pîkselplanetê"
-
-#: src/ssr/PasswordReset.jsx:50
-#, javascript-format
-msgid "Hello ${ name }, you can set your new password here:"
-msgstr "Silav ${ name }, hûn dikarin şîfreya xwe ya nû li vir destnîşan bikin:"
-
-#: src/ssr/PasswordReset.jsx:54
-msgid "New Password"
-msgstr "Şîfreya Nû"
-
-#: src/ssr/PasswordReset.jsx:60
-msgid "Confirm New Password"
-msgstr "Şîfreya Nû piştrast bikin"
-
-#: src/ssr/PasswordReset.jsx:65
-msgid "Submit"
-msgstr "Pêşkêş kirin"
-
-#: src/routes/api/modtools.js:53
-msgid "You are not logged in"
-msgstr "Tu ne têketinê"
-
-#: src/routes/api/modtools.js:65
-msgid "You are not allowed to access this page"
-msgstr "Destûr nayê dayîn ku hûn bigihîjin vê rûpelê"
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr "Tenê admin dikarin wiya bikin"
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Hûn ne qedexe ne"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Kaptcha nayê dayîn"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-Mail jixwe tê bikar anîn."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Navê bikarhêner jixwe tê bikaranîn."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Te pir dirêj kir, careke din biceribîne."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Te captcha xwe bi ser neket"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Çewtiya Captcha nenas"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Ev pêşkêşkarê e-mail nayê destûr kirin"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Nekarî bikarhênerek nû biafirîne :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Piştî qeydkirinê danişîn nehat damezrandin :("
-
-#: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
-msgid "Mail verification"
-msgstr "Rastandina nameyê"
-
-#: src/routes/api/auth/verify.js:27
-msgid "You are now verified :)"
-msgstr "Hûn niha hatine piştrast kirin :)"
-
-#: src/routes/api/auth/verify.js:35
-msgid ""
-"Your mail verification code is invalid or already expired :(, please request "
-"a new one."
-msgstr ""
-"Koda verastkirina e-mail we nederbasdar e an jixwe qediyaye :(, ji kerema "
-"xwe yekî nû bixwaze."
-
-#: src/routes/api/auth/logout.js:11
-msgid "You are not even logged in."
-msgstr "Hûn ne têketinê jî ne."
-
-#: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
-msgid "Server error when logging out."
-msgstr "Çewtiya serverê dema têketinê."
-
-#: 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 "Hûn ne piştrastkirî ne."
-
-#: 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 "Şîfreya çewt!"
-
-#: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
-msgstr "Bikarhênerên Bêdengî nikarin hesabê xwe jêbikin."
-
-#: src/routes/api/auth/change_mail.js:62
-msgid "Muted Users can not do this."
-msgstr "Bikarhênerên bêdeng nikarin vê yekê bikin."
-
-#: src/ssr/RedirectionPage.jsx:19
-msgid "PixelPlanet.fun Accounts"
-msgstr "Hesabên PixelPlanet.fun"
-
-#: src/ssr/RedirectionPage.jsx:29
-msgid "You will be automatically redirected after 15s"
-msgstr "Hûn ê piştî 15 hûrdeman bixweber werin verast kirin"
-
-#: src/ssr/RedirectionPage.jsx:30
-#, javascript-format
-msgid "Or ${ clickHere } to go back to pixelplanet"
-msgstr "An jî ${ clickHere } vegere pixelplanet"
-
-#: src/canvasesDesc.js:20
-msgid "Earth"
-msgstr "Erd"
-
-#: src/canvasesDesc.js:21
-msgid "Moon"
-msgstr "Heyv"
-
-#: src/canvasesDesc.js:22
-msgid "3D Canvas"
-msgstr "3D kanvas"
-
-#: src/canvasesDesc.js:23
-msgid "Coronavirus"
-msgstr "Coronavirus"
-
-#: src/canvasesDesc.js:24
-msgid "PixelZone"
-msgstr "PixelZone"
-
-#: src/canvasesDesc.js:25
-msgid "PixelCanvas"
-msgstr "Pixelkanvas"
-
-#: src/canvasesDesc.js:26
-msgid "1bit"
-msgstr "1bit"
-
-#: src/canvasesDesc.js:27
-msgid "Top10"
-msgstr "lîstikvan10"
-
-#: src/canvasesDesc.js:28
-msgid "2bit"
-msgstr "2bit"
-
-#: src/canvasesDesc.js:29
-msgid "Minimap"
-msgstr "Nexşeya mînî"
-
-#: src/canvasesDesc.js:32
-msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
-msgstr ""
-"Kulîlka meya sereke, nexşeyek mezin a cîhanê. Li cîhê ku hûn dixwazin bi cîh "
-"bikin!"
-
-#: 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 ""
-"Kanvasê Heyv. Cihê ewle ji bo hunerê. No al an nivîsek mezin (heya ku beşek "
-"hunerê nebe) an hunerek ji 1,5k x 1,5k piksel mezintir tune."
-
-#: src/canvasesDesc.js:34
-msgid "Place Voxels on a 3D canvas with others."
-msgstr "voxelên bi yên din re li ser kanvasek 3D bi cîh bikin."
-
-#: src/canvasesDesc.js:35
-msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-msgstr "Kanvas taybetî ji bo belavkirina hişmendiya SARS-CoV2 (vax bigire)."
-
-#: src/canvasesDesc.js:36
-msgid "Mirror of PixelZone"
-msgstr "Neynika ji PixelZone"
-
-#: src/canvasesDesc.js:37
-msgid "Mirror of PixelCanvas"
-msgstr "Neynika Pîkselkanvas"
-
-#: src/canvasesDesc.js:38
-msgid "Black and White canvas"
-msgstr "kanvasê Reş û Spî"
-
-#: 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 ""
-"Kanvasek ji bo lîstikvanên herî çalak ên roja berê. Rojane nûvekirinên rêzê "
-"di 00:00 UTC de."
-
-#: src/canvasesDesc.js:40
-msgid "Only four colors. Same rules as moon!"
-msgstr "Tenê çar reng. Heman qaîdeyên wekî heyvê!"
-
-#: src/canvasesDesc.js:41
-msgid ""
-"Conquer land on a smaller earth with protected ocean. Shares cooldown with "
-"earth canvas!"
-msgstr ""
-"Erdê li ser erdek piçûktir bi okyanûsa parastî fetih bikin. Sersaxiyê bi "
-"kanvasê erdê re parve dike!"
-
-#: src/core/MailProvider.js:66
-#, javascript-format
-msgid "Welcome ${ name } to PixelPlanet, please verify your mail"
-msgstr ""
-"Bi xêr hatî ${ name } PixelPlanet, ji kerema xwe e-mail xwe verast bikin"
-
-#: src/core/MailProvider.js:67
-#, javascript-format
-msgid "Hello ${ name }"
-msgstr "Silav ${ name }"
-
-#: 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 ""
-"hûn bi xêr hatin civata meya piçûk a pixelplacers, ji bo ku hûn hesabê xwe "
-"bikar bînin, divê hûn e-nameya xwe verast bikin. Hûn dikarin li vir bikin: "
-
-#: src/core/MailProvider.js:68
-msgid "Click to Verify"
-msgstr "Ji bo erêkirinê bitikîne"
-
-#: src/core/MailProvider.js:68 src/core/MailProvider.js:105
-msgid "Or by copying following url:"
-msgstr "An jî bi kopîkirina url-ya jêrîn:"
-
-#: src/core/MailProvider.js:69
-msgid ""
-"Have fun and don't hesitate to contact us if you encounter any problems :)"
-msgstr ""
-"Kêfxweş bin û heke pirsgirêkek we hebe dudilî nebin ku bi me re têkilî "
-"daynin :)"
-
-#: src/core/MailProvider.js:70 src/core/MailProvider.js:107
-msgid "Thanks"
-msgstr "Spas"
-
-#: src/core/MailProvider.js:87
-#, javascript-format
-msgid ""
-"We already sent you a verification mail, you can request another one in "
-"${ minLeft } minutes."
-msgstr ""
-"Me berê ji we re e-nameyek verastkirinê şand, hûn dikarin di nav "
-"${ minLeft } hûrdeman de nameyek din bixwazin."
-
-#: src/core/MailProvider.js:103
-msgid "You forgot your password for PixelPlanet? Get a new one here"
-msgstr "We şîfreya xwe ji bo PixelPlanet ji bîr kir? Li vir yekî nû bistînin"
-
-#: src/core/MailProvider.js:104
-msgid "Hello"
-msgstr "Slav"
-
-#: src/core/MailProvider.js:105
-msgid ""
-"You requested to get a new password. You can change your password within the "
-"next 30min here: "
-msgstr ""
-"We xwest ku şîfreyek nû bistînin. Hûn dikarin şîfreya xwe di nav 30 hûrdeman "
-"de li vir biguhezînin: "
-
-#: 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 ""
-"Ger we ev mail daxwaz nekir, ji kerema xwe guh nede wê (IP-ya ku ev e-name "
-"xwest ${ ip } bû)."
-
-#: src/core/MailProvider.js:114
-msgid "Mail is not configured on the server"
-msgstr "Mail li ser serverê nehatiye mîheng kirin"
-
-#: src/core/MailProvider.js:122
-msgid ""
-"We already sent you a mail with instructions. Please wait before requesting "
-"another mail."
-msgstr ""
-"Me berê ji we re e-mail bi talîmatan şand. Ji kerema xwe berî ku e-mail din "
-"daxwaz bikin bisekinin."
-
-#: src/core/MailProvider.js:130
-msgid "Couldn't find this mail in our database"
-msgstr "Di databasa me de ev e-mail nehat dîtin"

i18n/ssr-ky.po

@@ -1,516 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2024-06-14 20:57+0000\n"
-"Last-Translator: Алихан Рафик <rafikalihan5@gmail.com>\n"
-"Language-Team: Kyrgyz <https://hosted.weblate.org/projects/pixelplanet/"
-"server/ky/>\n"
-"Language: ky\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6-dev\n"
-
-#: src/core/ChatProvider.js:434
-msgid "You can not send chat messages while using a 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
-msgid "You are banned"
-msgstr "Сиз тыюу салынган"
-
-#: src/core/ChatProvider.js:443
-msgid "Your Internet Provider is banned"
-msgstr "Сиздин Интернет Провайдериңизге тыюу салынган"
-
-#: src/core/ChatProvider.js:448
-#, javascript-format
-msgid "You are muted for another ${ timeMin } minutes"
-msgstr "Үнүңүз дагы ${ timeMin } мүнөткө өчүрүлдү"
-
-#: src/core/ChatProvider.js:450
-#, javascript-format
-msgid "You are muted for another ${ ttl } seconds"
-msgstr "Сиз дагы ${ ttl } секундага үнсүзсүз"
-
-#: src/core/ChatProvider.js:467
-#, javascript-format
-msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
-msgstr ""
-"Сиз билдирүүлөрдү өтө тез жөнөтүп жатасыз, ${ waitTime }с күтүшүңүз керек :("
-
-#: src/core/ChatProvider.js:471
-msgid "You don't have access to this channel"
-msgstr "Бул каналга кирүү мүмкүнчүлүгүңүз жок"
-
-#: src/core/ChatProvider.js:490
-msgid "Your mail has to be verified in order to chat"
-msgstr "Маектешүү үчүн почтаңыз текшерилиши керек"
-
-#: 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 "Сураныч int каналды колдонуңуз"
-
-#: 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
-msgid "Your passwords do not match :("
-msgstr "Сырсөздөрүңүз дал келбейт :("
-
-#: src/routes/reset_password.js:77
-msgid "User doesn't exist in our database :("
-msgstr "Колдонуучу биздин маалымат базасында жок :("
-
-#: src/routes/reset_password.js:89
-msgid "Password successfully changed."
-msgstr "Сырсөз ийгиликтүү өзгөртүлдү."
-
-#: src/routes/reset_password.js:108
-msgid "Invalid url :( Please check your mail again."
-msgstr "Жараксыз url :( Почтаңызды кайра текшериңиз."
-
-#: 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 "Жүктөлүүдө..."
-
-#: src/ssr/PopUp.jsx:47
-msgid "ppfun"
-msgstr "ppfun"
-
-#: src/ssr/PopUp.jsx:48
-msgid "PixelPlanet.Fun PopUp"
-msgstr "PixelPlanet.Fun Калкыма"
-
-#: src/ssr/Main.jsx:68
-msgid "PixelPlanet.Fun"
-msgstr "PixelPlanet.Fun"
-
-#: src/ssr/Main.jsx:69
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-"Башка онлайн оюнчулар менен карта стилиндеги холстка түстүү пикселдерди "
-"жайгаштырыңыз"
-
-#: src/utils/validation.js:17
-msgid "Email can't be empty."
-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 "Электрондук почтада @ болушу керек"
-
-#: src/utils/validation.js:29
-msgid "Name can't be empty."
-msgstr "Аты бош болбошу керек."
-
-#: src/utils/validation.js:30
-msgid "Name must be at least 2 characters long"
-msgstr "Аты кеминде 2 белгиден турушу керек"
-
-#: src/utils/validation.js:31
-msgid "Name must be shorter than 26 characters"
-msgstr "Аты 26 белгиден кыска болушу керек"
-
-#: src/utils/validation.js:38
-msgid "Name contains invalid character like @, /, \\ or #"
-msgstr "Аталышы @, /, \\ же # сыяктуу жараксыз белгини камтыйт"
-
-#: src/utils/validation.js:53
-msgid "No password given."
-msgstr "Сырсөз берилген жок."
-
-#: src/utils/validation.js:56
-msgid "Password must be at least 6 characters long."
-msgstr "Сырсөз кеминде 6 белгиден турушу керек."
-
-#: src/utils/validation.js:59
-msgid "Password must be shorter than 60 characters."
-msgstr "Сырсөз 60 белгиден кыска болушу керек."
-
-#: src/ssr/PasswordReset.jsx:20
-#: src/ssr/PasswordReset.jsx:40
-msgid "PixelPlanet.fun Password Reset"
-msgstr "PixelPlanet.fun Сырсөздү баштапкы абалга келтирүү"
-
-#: 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
-msgid "Reset Password"
-msgstr "Сырсөздү кайра коюу"
-
-#: src/ssr/PasswordReset.jsx:30
-#: src/ssr/RedirectionPage.jsx:12
-msgid "Click here"
-msgstr "Бул жерди басыңыз"
-
-#: src/ssr/PasswordReset.jsx:30
-msgid "to go back to pixelplanet"
-msgstr "pixelplanet кайтуу үчүн"
-
-#: src/ssr/PasswordReset.jsx:50
-#, javascript-format
-msgid "Hello ${ name }, you can set your new password here:"
-msgstr "Салам ${ name }, жаңы сырсөзүңүздү бул жерден орното аласыз:"
-
-#: src/ssr/PasswordReset.jsx:54
-msgid "New Password"
-msgstr "жаңы сыр сөз"
-
-#: src/ssr/PasswordReset.jsx:60
-msgid "Confirm New Password"
-msgstr "Жаңы сырсөздү ырастоо"
-
-#: src/ssr/PasswordReset.jsx:65
-msgid "Submit"
-msgstr "Тапшыруу"
-
-#: src/routes/api/modtools.js:53
-msgid "You are not logged in"
-msgstr "Сиз кирген жоксуз"
-
-#: src/routes/api/modtools.js:65
-msgid "You are not allowed to access this page"
-msgstr "Сиз бул баракчага кирүүгө уруксатыңыз жок"
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr "Муну жөн гана админдер жасай алат"
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Сиз тыюу салынган эмес"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha берилген эмес"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-mail мурунтан эле колдонулууда."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Колдонуучунун аты мурунтан эле колдонулууда."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Өтө көпкө кеттиңиз, кайра аракет кылыңыз."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Сиз captcha'ны аткара алган жоксуз"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr "Сураныч, веб-сайтты жаңыртыңыз"
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Белгисиз Captcha катасы"
-
-#: src/routes/api/auth/change_mail.js:22
-#: src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Бул электрондук почта провайдерине уруксат жок"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Жаңы колдонуучу түзүлбөй калды :("
-
-#: src/routes/api/auth/register.js:108
-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
-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
-#, fuzzy, javascript-format
-msgid "Or ${ clickHere } to go back to pixelplanet"
-msgstr "Же pixelplanetке кайтуу үчүн ${ Click Here }"
-
-#: src/canvasesDesc.js:20
-msgid "Earth"
-msgstr "Жер"
-
-#: src/canvasesDesc.js:21
-msgid "Moon"
-msgstr "Ай"
-
-#: src/canvasesDesc.js:22
-msgid "3D Canvas"
-msgstr "3D Канвас"
-
-#: src/canvasesDesc.js:23
-msgid "Coronavirus"
-msgstr "Коронавирус"
-
-#: src/canvasesDesc.js:24
-msgid "PixelZone"
-msgstr "PixelZone"
-
-#: src/canvasesDesc.js:25
-msgid "PixelCanvas"
-msgstr "PixelCanvas"
-
-#: src/canvasesDesc.js:26
-msgid "1bit"
-msgstr "1бит"
-
-#: src/canvasesDesc.js:27
-msgid "Top10"
-msgstr "Топ 10"
-
-#: src/canvasesDesc.js:28
-msgid "2bit"
-msgstr "2бит"
-
-#: src/canvasesDesc.js:29
-msgid "Minimap"
-msgstr "Миникарта"
-
-#: src/canvasesDesc.js:32
-msgid "Our main canvas, a huge map of the world. Place anywhere 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 ""
-"Ай кенеп. Искусство үчүн коопсуз жай. 1.5k x 1.5k пикселден чоңураак "
-"желекчелер же чоң текст (эгер искусствонун бөлүгү болбосо) же сүрөт жок."
-
-#: src/canvasesDesc.js:34
-msgid "Place Voxels on a 3D canvas with others."
-msgstr "Voxels'ти башкалар менен 3D кенепке жайгаштырыңыз."
-
-#: src/canvasesDesc.js:35
-msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-msgstr ""
-"SARS-CoV2 жөнүндө маалымдуулукту жайылтуу үчүн атайын кенеп (вакцинаны "
-"алыңыз)"
-
-#: src/canvasesDesc.js:36
-msgid "Mirror of PixelZone"
-msgstr "PixelZone күзгүсү"
-
-#: src/canvasesDesc.js:37
-msgid "Mirror of PixelCanvas"
-msgstr "PixelCanvas күзгүсү"
-
-#: 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 ""
-"Мурунку күндөгү эң активдүү оюнчулар үчүн кенеп. Күнүмдүк рейтинг "
-"жаңыртуулары 00:00 UTC."
-
-#: 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 "${ name } PixelPlanet'ке кош келиңиз, почтаңызды ырастаңыз"
-
-#: src/core/MailProvider.js:67
-#, javascript-format
-msgid "Hello ${ name }"
-msgstr "Салам ${ name }"
-
-#: 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 "Же төмөнкү url көчүрүү менен:"
-
-#: 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 ""
-"Биз сизге текшерүү катын жөнөткөнбүз, ${ minLeft } мүнөттөн кийин башкасын "
-"сурасаңыз болот."
-
-#: src/core/MailProvider.js:103
-msgid "You forgot your password for PixelPlanet? Get a new one here"
-msgstr ""
-"PixelPlanet үчүн сырсөзүңүздү унутуп калдыңызбы? Бул жерден жаңысын алыңыз"
-
-#: 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 ""
-"Сиз жаңы сырсөз алууну сурандыңыз. Кийинки 30 мүнөт ичинде сырсөзүңүздү бул "
-"жерден өзгөртө аласыз: "
-
-#: 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 ""
-"Эгер сиз бул катты сурабасаңыз, ага көңүл бурбаңыз (бул катты сураган IP ${ "
-"ip } болчу)."
-
-#: src/core/MailProvider.js:114
-msgid "Mail is not configured on the server"
-msgstr "Почта серверде конфигурацияланган эмес"
-
-#: src/core/MailProvider.js:122
-msgid ""
-"We already sent you a mail with instructions. Please wait before requesting "
-"another mail."
-msgstr ""
-"Биз сизге көрсөтмөлөрдү камтыган кат жөнөткөнбүз. Сураныч, башка почта "
-"сураганга чейин күтө туруңуз."
-
-#: src/core/MailProvider.js:130
-msgid "Couldn't find this mail in our database"
-msgstr "Бул кат биздин маалымат базасынан табылган жок"

i18n/ssr-mk.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-06-10 20:09+0000\n"
+"PO-Revision-Date: 2024-04-04 20:02+0000\n"
 "Last-Translator: David <stojanovskidavid74@gmail.com>\n"
 "Language-Team: Macedonian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/mk/>\n"
@@ -8,100 +8,98 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: Weblate 5.6-dev\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 "Не можете да испраќате пораки за разговор додека користите прокси"
+msgstr ""
 
 #: src/core/ChatProvider.js:436
 msgid "Your country is temporary muted from this chat channel"
-msgstr "Твојата држава е мутирана од овој канал"
+msgstr ""
 
 #: src/core/ChatProvider.js:439
 msgid "You are permanently muted, join our guilded to appeal the mute"
 msgstr ""
-"Вие сте трајно исклучени, придружете се на нашиот еснаф за да го обжалите "
-"немиот"
 
 #: src/core/ChatProvider.js:441
 msgid "You are banned"
-msgstr "Ти си баниран"
+msgstr ""
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
-msgstr "Вашиот интернет провајдер е забранет"
+msgstr ""
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
 msgid "You are muted for another ${ timeMin } minutes"
-msgstr "Вие сте исклучени уште ${ timeMin } минути"
+msgstr ""
 
 #: src/core/ChatProvider.js:450
 #, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
-msgstr "Вие сте исклучени уште ${ ttl } секунди"
+msgstr ""
 
 #: src/core/ChatProvider.js:467
 #, javascript-format
 msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
-msgstr "Премногу брзо испраќате пораки, мора да почекате ${ waitTime }s :("
+msgstr ""
 
 #: src/core/ChatProvider.js:471
 msgid "You don't have access to this channel"
-msgstr "Немате пристап до овој канал"
+msgstr ""
 
 #: src/core/ChatProvider.js:490
 msgid "Your mail has to be verified in order to chat"
-msgstr "Вашата пошта треба да биде потврдена за да разговарате"
+msgstr ""
 
 #: src/core/ChatProvider.js:500
 msgid "You can't send a message this long :("
-msgstr "Не можеш толку долго да праќаш порака :("
+msgstr ""
 
 #: src/core/ChatProvider.js:504
 msgid "Please use int channel"
-msgstr "Ве молиме користете int канал"
+msgstr ""
 
 #: src/core/ChatProvider.js:512
 msgid "Stop flooding."
-msgstr "Престанете со поплавите."
+msgstr ""
 
 #: src/routes/reset_password.js:39
 msgid "You sent an empty password or invalid data :("
-msgstr "Испративте празна лозинка или невалидни податоци :("
+msgstr ""
 
 #: src/routes/reset_password.js:51
 msgid "This password-reset link isn't valid anymore :("
-msgstr "Оваа врска за ресетирање лозинка повеќе не е валидна :("
+msgstr ""
 
 #: src/routes/reset_password.js:62
 msgid "Your passwords do not match :("
-msgstr "Твојот Пасворд не се совпаѓа :("
+msgstr ""
 
 #: src/routes/reset_password.js:77
 msgid "User doesn't exist in our database :("
-msgstr "Корисникот не постои во нашата база на податоци :("
+msgstr ""
 
 #: src/routes/reset_password.js:89
 msgid "Password successfully changed."
-msgstr "Лозинката е успешно сменета."
+msgstr ""
 
 #: src/routes/reset_password.js:108
 msgid "Invalid url :( Please check your mail again."
-msgstr "Неважечка URL адреса: (Проверете ја вашата пошта повторно."
+msgstr ""
 
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
-msgstr "PixelPlanet.Fun 3DGlobe"
+msgstr ""
 
 #: src/ssr/Globe.jsx:38
 msgid "A 3D globe of our whole map"
-msgstr "3D глобус од целата наша мапа"
+msgstr ""
 
 #: src/ssr/Globe.jsx:51
 msgid "Double click on globe to go back."
-msgstr "Кликнете двапати на глобус за да се вратите назад."
+msgstr ""
 
 #: src/ssr/Globe.jsx:52
 msgid "Loading..."
@@ -109,350 +107,331 @@ msgstr "Вчитување..."
 
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
-msgstr "ппфун"
+msgstr ""
 
 #: src/ssr/PopUp.jsx:48
 msgid "PixelPlanet.Fun PopUp"
-msgstr "PixelPlanet.Fun скокачки прозорец"
+msgstr ""
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
-msgstr "PixelPlanet.Fun"
+msgstr ""
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
-"Ставете пиксели во боја на платно со стил на мапа со други играчи на интернет"
 
 #: src/utils/validation.js:17
 msgid "Email can't be empty."
-msgstr "Емаил не може да биде празен."
+msgstr ""
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
-msgstr "Е-поштата треба да биде долга најмалку 5 знаци."
+msgstr ""
 
 #: src/utils/validation.js:19
 msgid "Email can't be longer than 40 characters."
-msgstr "Е-поштата не може да биде подолга од 40 знаци."
+msgstr ""
 
 #: src/utils/validation.js:20
 msgid "Email should at least contain a dot"
-msgstr "Е-поштата треба барем да содржи точка"
+msgstr ""
 
 #: src/utils/validation.js:22
 msgid "Email should contain a @"
-msgstr "Е-поштата треба да содржи @"
+msgstr ""
 
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
-msgstr "Името не може да биде празно."
+msgstr ""
 
 #: src/utils/validation.js:30
 msgid "Name must be at least 2 characters long"
-msgstr "Името мора да биде долго најмалку 2 знаци"
+msgstr ""
 
 #: src/utils/validation.js:31
 msgid "Name must be shorter than 26 characters"
-msgstr "Името мора да биде пократко од 26 знаци"
+msgstr ""
 
 #: src/utils/validation.js:38
 msgid "Name contains invalid character like @, /, \\ or #"
-msgstr "Името содржи неважечки знак како @, /, \\ или #"
+msgstr ""
 
 #: src/utils/validation.js:53
 msgid "No password given."
-msgstr "Не е дадена лозинка."
+msgstr ""
 
 #: src/utils/validation.js:56
 msgid "Password must be at least 6 characters long."
-msgstr "Лозинката мора да биде долга најмалку 6 знаци."
+msgstr ""
 
 #: src/utils/validation.js:59
 msgid "Password must be shorter than 60 characters."
-msgstr "Лозинката мора да биде пократка од 60 знаци."
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
 msgid "PixelPlanet.fun Password Reset"
-msgstr "PixelPlanet.fun Ресетирање на лозинка"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:21 src/ssr/PasswordReset.jsx:41
 msgid "Reset your password here"
-msgstr "Ресетирајте ја лозинката овде"
+msgstr ""
 
 #: src/core/MailProvider.js:105 src/ssr/PasswordReset.jsx:28
 #: src/ssr/PasswordReset.jsx:49
 msgid "Reset Password"
-msgstr "Ресетирање на Лозинка"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
 msgid "Click here"
-msgstr "Кликни тука"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:30
 msgid "to go back to pixelplanet"
-msgstr "да се вратиме на пикселпланет"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:50
 #, javascript-format
 msgid "Hello ${ name }, you can set your new password here:"
-msgstr "Здраво ${ name }, можете да ја поставите вашата нова лозинка овде:"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:54
 msgid "New Password"
-msgstr "Нова лозинка"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:60
 msgid "Confirm New Password"
-msgstr "Потврди ја новата лозинка"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:65
 msgid "Submit"
 msgstr "Потврди"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr ""
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
-msgstr "Не сте најавени"
+msgstr ""
 
 #: src/routes/api/modtools.js:65
 msgid "You are not allowed to access this page"
-msgstr "Не ви е дозволен пристап на оваа страница"
+msgstr ""
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
-msgstr "Само администраторите можат да го направат тоа"
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Не сте банирани"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Не е дадена Captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Е-пошта веќе се користи."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Корисничкото име веќе е во употреба."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Ви требаше премногу долго, обидете се повторно."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Не успеавте со вашата captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr "ве молиме освежете ја страницата"
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Непозната Каптча грешка"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Овој давател на е-пошта не е дозволен"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Не успеа да се создаде нов корисник :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Не успеа да се воспостави сесија по регистрацијата :("
+msgstr ""
 
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
-msgstr "Потврда по пошта"
+msgstr ""
 
 #: src/routes/api/auth/verify.js:27
 msgid "You are now verified :)"
-msgstr "Сега сте потврдени :)"
+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 "Не сте ни најавени."
+msgstr ""
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
 msgid "Server error when logging out."
-msgstr "Грешка на серверот при одјавување."
+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 "Не сте автентицирани."
+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 "Погрешна лозинка!"
+msgstr ""
 
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
-msgstr "Исклучените корисници не можат да ја избришат својата сметка."
+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/change_mail.js:62
 msgid "Muted Users can not do this."
-msgstr "Исклучените корисници не можат да го направат ова."
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
 msgid "PixelPlanet.fun Accounts"
-msgstr "PixelPlanet.Fun сметки"
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:29
 msgid "You will be automatically redirected after 15s"
-msgstr "Ќе бидете автоматски пренасочени по 15s"
+msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:30
 #, javascript-format
 msgid "Or ${ clickHere } to go back to pixelplanet"
-msgstr "Или ${ clickHere } за да се вратите на pixelplanet"
+msgstr ""
+
+#: src/routes/api/auth/register.js:31
+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 ""
 
 #: src/canvasesDesc.js:20
 msgid "Earth"
-msgstr "Земјата"
+msgstr ""
 
 #: src/canvasesDesc.js:21
 msgid "Moon"
-msgstr "Месечината"
+msgstr ""
 
 #: src/canvasesDesc.js:22
 msgid "3D Canvas"
-msgstr "3D платно"
+msgstr ""
 
 #: src/canvasesDesc.js:23
 msgid "Coronavirus"
-msgstr "Корона вирус"
+msgstr ""
 
 #: src/canvasesDesc.js:24
 msgid "PixelZone"
-msgstr "PixelZone"
+msgstr ""
 
 #: src/canvasesDesc.js:25
 msgid "PixelCanvas"
-msgstr "PixelCanvas"
+msgstr ""
 
 #: src/canvasesDesc.js:26
 msgid "1bit"
-msgstr "1bit"
+msgstr ""
 
 #: src/canvasesDesc.js:27
 msgid "Top10"
-msgstr "Топ10"
+msgstr ""
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
-msgstr "2bit"
+msgstr ""
 
 #: src/canvasesDesc.js:29
 msgid "Minimap"
-msgstr "Минимапа"
+msgstr ""
 
 #: src/canvasesDesc.js:32
 msgid "Our main canvas, a huge map of the world. Place anywhere 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 ""
-"Месечево платно. Безбеден простор за уметност. Нема знаменца или голем текст "
-"(освен ако не е дел од уметност) или уметност поголема од 1,5k x 1,5k "
-"пиксели."
 
 #: src/canvasesDesc.js:34
 msgid "Place Voxels on a 3D canvas with others."
-msgstr "Ставете Voxels на 3D платно со други."
+msgstr ""
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-msgstr "Специјално платно за ширење на свеста за САРС-КоВ2 (земи го вакс)."
+msgstr ""
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
-msgstr "Огледало на PixelZone"
+msgstr ""
 
 #: src/canvasesDesc.js:37
 msgid "Mirror of PixelCanvas"
-msgstr "Огледало на PixelCanvas"
+msgstr ""
 
 #: src/canvasesDesc.js:38
 msgid "Black and White canvas"
-msgstr "Црно-бело платно"
+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 ""
-"Платно за најактивните играчи од претходниот ден. Дневни ажурирања на "
-"рангирањето во 00:00 UTC."
 
 #: src/canvasesDesc.js:40
 msgid "Only four colors. Same rules as moon!"
-msgstr "Само четири бои. Истите правила како месечината!"
+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 ""
-"Добре дојдовте ${ name } на PixelPlanet, ве молиме потврдете ја вашата пошта"
 
 #: src/core/MailProvider.js:67
 #, javascript-format
 msgid "Hello ${ name }"
-msgstr "Здраво ${ 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 "Кликнете за да потврдите"
+msgstr ""
 
 #: src/core/MailProvider.js:68 src/core/MailProvider.js:105
 msgid "Or by copying following url:"
-msgstr "Или со копирање на следнава 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 "Благодарам"
+msgstr ""
 
 #: src/core/MailProvider.js:87
 #, javascript-format
@@ -460,24 +439,20 @@ msgid ""
 "We already sent you a verification mail, you can request another one in "
 "${ minLeft } minutes."
 msgstr ""
-"Веќе ви испративме пошта за потврда, може да побарате друга за ${ minLeft } "
-"минути."
 
 #: src/core/MailProvider.js:103
 msgid "You forgot your password for PixelPlanet? Get a new one here"
-msgstr "Ја заборавивте лозинката за PixelPlanet? Земете нов овде"
+msgstr ""
 
 #: src/core/MailProvider.js:104
 msgid "Hello"
-msgstr "Здраво"
+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 ""
-"Побаравте да добиете нова лозинка. Можете да ја промените вашата лозинка во "
-"следните 30 минути овде: "
 
 #: src/core/MailProvider.js:106
 #, javascript-format
@@ -485,21 +460,17 @@ msgid ""
 "If you did not request this mail, please just ignore it (the ip that "
 "requested this mail was ${ ip })."
 msgstr ""
-"Ако не сте ја побарале оваа е-пошта, ве молиме едноставно игнорирајте ја (IP-"
-"ата што ја побара оваа пошта беше ${ ip })."
 
 #: src/core/MailProvider.js:114
 msgid "Mail is not configured on the server"
-msgstr "Поштата не е конфигурирана на серверот"
+msgstr ""
 
 #: src/core/MailProvider.js:122
 msgid ""
 "We already sent you a mail with instructions. Please wait before requesting "
 "another mail."
 msgstr ""
-"Веќе ви испративме пошта со инструкции. Ве молиме почекајте пред да побарате "
-"друга пошта."
 
 #: src/core/MailProvider.js:130
 msgid "Couldn't find this mail in our database"
-msgstr "Не може да се најде оваа пошта во нашата база на податоци"
+msgstr ""

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,11 +125,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun-pop-up"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Plaats kleurpixels op een canvas in kaartstijl samen met andere spelers "
@@ -218,6 +240,10 @@ msgstr "Bevestig nieuw wachtwoord"
 msgid "Submit"
 msgstr "Indienen"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Je bent niet gebanned"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Je bent niet ingelogd"
@@ -226,54 +252,15 @@ msgstr "Je bent niet ingelogd"
 msgid "You are not allowed to access this page"
 msgstr "U heeft geen toegang tot deze pagina"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "Geen Captcha gegeven"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Email is al in gebruik."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Gebruikersnaam al in gebruik."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Het duurde te lang, probeer het opnieuw."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Je captcha is mislukt"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Onbekende Captcha-fout"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Deze e-mailprovider is niet toegestaan"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Kan nieuwe gebruiker niet aanmaken :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Kan sessie niet tot stand brengen na registratie :("
-
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "E-mail verificatie"
@@ -312,6 +299,11 @@ 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"
+msgstr "Deze e-mailprovider is niet toegestaan"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
@@ -330,6 +322,97 @@ msgstr "Na 15 seconden wordt u automatisch doorgestuurd"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Of ${ clickHere } om terug te gaan naar pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Geen Captcha gegeven"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Email is al in gebruik."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Gebruikersnaam al in gebruik."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Het duurde te lang, probeer het opnieuw."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Je captcha is mislukt"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Onbekende Captcha-fout"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Kan nieuwe gebruiker niet aanmaken :("
+
+#: src/routes/api/auth/register.js:105
+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"
@@ -371,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"
@@ -386,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"
@@ -393,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
@@ -416,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,12 +142,13 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Бынæттæ хуызы пикселтæ четæны стил картæмæ иумæ иннæ хъазæгтæмæ онлайн"
 
@@ -216,6 +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"
@@ -226,56 +257,55 @@ msgstr "Æгæрыстæмæй дæ æнæ бацумæ."
 msgid "You are not allowed to access this page"
 msgstr "Нæй гæнæн бацæуæн къаналмæ ай"
 
-#: src/routes/api/modtools.js:209
+#: 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 "Дæ аутентификацийы нæй."
 
-#: src/routes/api/auth/register.js:27
+#: 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:30
+#: src/routes/api/auth/register.js:34
 msgid "E-Mail already in use."
 msgstr "Електронон адрис æрцахс нырид."
 
-#: src/routes/api/auth/register.js:32
+#: src/routes/api/auth/register.js:36
 msgid "Username already in use."
 msgstr "Пайдагæнæджы ном æрцахс нырид."
 
-#: src/routes/api/auth/register.js:55
+#: src/routes/api/auth/register.js:59
 msgid "You took too long, try again."
 msgstr "Бахардз дæ æгæр бирæ рæстæг, бафæлвар иу хатт ма."
 
-#: src/routes/api/auth/register.js:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
 msgstr "Дæ Captcha фæкъуыхцы у"
 
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
 msgstr "Æнæзонгæ Captcha Рæдыд"
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
+#: src/routes/api/auth/register.js:89
 msgid "Failed to create new user :("
 msgstr "Ног пайдагæнæг сфæлдис æнæ бантыc :("
 
-#: src/routes/api/auth/register.js:108
+#: 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 "Посты басгæрст"
@@ -312,11 +342,23 @@ 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 ""
 
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -332,6 +374,42 @@ 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"
+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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Зæхх"
@@ -373,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 ""
 "Нæ сæйраг четæн, тынг стыр дунейы картæ. Бынат алкæм, кæм зæрдæдмæ цæуы дæ"
 
@@ -387,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 четæны иумæ иннæмæ"
@@ -394,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
@@ -415,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-ota.po

@@ -108,11 +108,11 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr ""
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr ""
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 
@@ -202,6 +202,10 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr ""
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr ""
@@ -210,54 +214,10 @@ msgstr ""
 msgid "You are not allowed to access this page"
 msgstr ""
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr ""
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr ""
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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 ""
@@ -296,6 +256,10 @@ msgstr ""
 msgid "Muted Users can not delete their account."
 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/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr ""
@@ -313,6 +277,38 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+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 ""
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr ""

i18n/ssr-otk.po

@@ -1,483 +0,0 @@
-msgid ""
-msgstr ""
-"Language: otk\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: src/core/ChatProvider.js:434
-msgid "You can not send chat messages while using a 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
-msgid "You are banned"
-msgstr ""
-
-#: src/core/ChatProvider.js:443
-msgid "Your Internet Provider is banned"
-msgstr ""
-
-#: 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
-msgid "Your mail has to be verified in order to chat"
-msgstr ""
-
-#: 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
-msgid "Your passwords do not match :("
-msgstr ""
-
-#: src/routes/reset_password.js:77
-msgid "User doesn't exist in our database :("
-msgstr ""
-
-#: src/routes/reset_password.js:89
-msgid "Password successfully changed."
-msgstr ""
-
-#: src/routes/reset_password.js:108
-msgid "Invalid url :( Please check your mail again."
-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 ""
-
-#: src/ssr/Globe.jsx:52
-msgid "Loading..."
-msgstr ""
-
-#: src/ssr/PopUp.jsx:47
-msgid "ppfun"
-msgstr ""
-
-#: src/ssr/PopUp.jsx:48
-msgid "PixelPlanet.Fun PopUp"
-msgstr ""
-
-#: src/ssr/Main.jsx:68
-msgid "PixelPlanet.Fun"
-msgstr ""
-
-#: src/ssr/Main.jsx:69
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-
-#: src/utils/validation.js:17
-msgid "Email can't be empty."
-msgstr ""
-
-#: src/utils/validation.js:18
-msgid "Email should be at least 5 characters long."
-msgstr ""
-
-#: src/utils/validation.js:19
-msgid "Email can't be longer than 40 characters."
-msgstr ""
-
-#: 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 ""
-
-#: src/utils/validation.js:29
-msgid "Name can't be empty."
-msgstr ""
-
-#: src/utils/validation.js:30
-msgid "Name must be at least 2 characters long"
-msgstr ""
-
-#: src/utils/validation.js:31
-msgid "Name must be shorter than 26 characters"
-msgstr ""
-
-#: src/utils/validation.js:38
-msgid "Name contains invalid character like @, /, \\ or #"
-msgstr ""
-
-#: src/utils/validation.js:53
-msgid "No password given."
-msgstr ""
-
-#: src/utils/validation.js:56
-msgid "Password must be at least 6 characters long."
-msgstr ""
-
-#: src/utils/validation.js:59
-msgid "Password must be shorter than 60 characters."
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:20
-#: src/ssr/PasswordReset.jsx:40
-msgid "PixelPlanet.fun Password Reset"
-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
-msgid "Reset Password"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:30
-#: src/ssr/RedirectionPage.jsx:12
-msgid "Click here"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:30
-msgid "to go back to pixelplanet"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:50
-#, javascript-format
-msgid "Hello ${ name }, you can set your new password here:"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:54
-msgid "New Password"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:60
-msgid "Confirm New Password"
-msgstr ""
-
-#: src/ssr/PasswordReset.jsx:65
-msgid "Submit"
-msgstr ""
-
-#: src/routes/api/modtools.js:53
-msgid "You are not logged in"
-msgstr ""
-
-#: src/routes/api/modtools.js:65
-msgid "You are not allowed to access this page"
-msgstr ""
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr ""
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr ""
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr ""
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr ""
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22
-#: src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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
-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 ""
-
-#: 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
-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 anywhere 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
-msgid "Place Voxels on a 3D canvas with others."
-msgstr ""
-
-#: src/canvasesDesc.js:35
-msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-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
-msgid ""
-"We already sent you a mail with instructions. Please wait before requesting "
-"another mail."
-msgstr ""
-
-#: src/core/MailProvider.js:130
-msgid "Couldn't find this mail in our database"
-msgstr ""

i18n/ssr-pl.po

@@ -116,11 +116,11 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "Pixelplanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Stawiaj kolorowe piksele na płótnie w stylu mapy wraz z innymi graczami "
@@ -212,6 +212,10 @@ msgstr "Potwierdź nowe hasło"
 msgid "Submit"
 msgstr "Podaj"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Nie jesteś zbanowany"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Nie jesteś zalogowany"
@@ -220,54 +224,10 @@ msgstr "Nie jesteś zalogowany"
 msgid "You are not allowed to access this page"
 msgstr "Nie masz dostępu do tej strony"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Tylko administracja może to zrobić"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Nie jesteś zbanowany"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Nie podano Captcha"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "ten mail jest już używany."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Nazwa użytkownika jest już przez kogoś używana."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Trwało to zbyt długo. Spróbuj ponownie."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Nie udało Ci się wykonać captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Nieznany błąd Captcha"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Ten dostawca maila jest niedozwolony"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Nie udało się stworzyć nowego konta :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Nie udało się ustanowić sesji po zarejestrowaniu :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "weryfikacja maila"
@@ -308,6 +268,10 @@ msgstr "Niepoprawne hasło!"
 msgid "Muted Users can not delete their account."
 msgstr "Wyciszeni Użytkownicy nie mogą usunąć swoich kont."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Ten dostawca maila jest niedozwolony"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Wyciszeni Użytkownicy nie mogą tego zrobić."
@@ -325,6 +289,38 @@ msgstr "Po 15 sekundach nastąpi automatyczne przekierowanie"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Lub ${clickHere }, aby wrócić do pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Nie podano Captcha"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "ten mail jest już używany."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Nazwa użytkownika jest już przez kogoś używana."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Trwało to zbyt długo. Spróbuj ponownie."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Nie udało Ci się wykonać captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Nieznany błąd Captcha"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Nie udało się stworzyć nowego konta :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Nie udało się ustanowić sesji po zarejestrowaniu :("
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Ziemia"

i18n/ssr-prg.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-05-16 20:01+0000\n"
+"PO-Revision-Date: 2024-03-24 14:49+0000\n"
 "Last-Translator: Negru Berg <denisfagetan975@gmail.com>\n"
 "Language-Team: Prussian <https://hosted.weblate.org/projects/pixelplanet/"
 "server/prg/>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= "
 "19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
@@ -116,11 +116,11 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun reklāmi"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "deīktan barwinsnas pikselāi tāutaskarti stīlan drābi sēn kitāi online"
 
@@ -210,6 +210,10 @@ msgstr "padrūktina nāuns kliptaswīrds"
 msgid "Submit"
 msgstr "paklusta"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "jūs assei ni ni preiwērpt"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "jūs ni ast senrissa"
@@ -218,54 +222,10 @@ msgstr "jūs ni ast senrissa"
 msgid "You are not allowed to access this page"
 msgstr "jūs assei ni preiwērpt prēi preiēisenis šis pāusan"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Ka tēr Deiwāi mazzi segēi stas"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "jūs assei ni ni preiwērpt"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Ni Captcha dāwusi"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Pōstikastens jāu tērpau."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "emmens jāu tērpau."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "jūs izlaīdja pēr tūlan kērdā, bānda etkūmps."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "jūs praspīli twajs captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Niwaīsts Captcha Error"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "šis pōstikastens ni ast preiwērpja"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "praspīli kurtun nāuns tērpautajs :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "praspīli gruntintun sīndausnā pa registrijja"
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "pōstikastens izbānda"
@@ -305,6 +265,10 @@ msgstr "blāndewingis kliptaswīrds!"
 msgid "Muted Users can not delete their account."
 msgstr "Dussaws tērpautajai ni izklìptina audrazza kōnts."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "šis pōstikastens ni ast preiwērpja"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Dussaws tērpautajai ni izklìptina segēi šis."
@@ -322,6 +286,38 @@ msgstr "jūs ast ēisei assei autōmatiska pabanginna pa 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "adder ${ clickHere } skassa pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Ni Captcha dāwusi"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Pōstikastens jāu tērpau."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "emmens jāu tērpau."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "jūs izlaīdja pēr tūlan kērdā, bānda etkūmps."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "jūs praspīli twajs captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Niwaīsts Captcha Error"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "praspīli kurtun nāuns tērpautajs :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "praspīli gruntintun sīndausnā pa registrijja"
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "zemē"
@@ -463,20 +459,16 @@ msgstr ""
 #: src/core/MailProvider.js:103
 msgid "You forgot your password for PixelPlanet? Get a new one here"
 msgstr ""
-"Tū assei izmīrsuns twajs PixelPlanet kliptaswīrds? Gaūnja nāuns kliptaswīrds "
-"šāi"
 
 #: src/core/MailProvider.js:104
 msgid "Hello"
-msgstr "Kaīls"
+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 ""
-"Jūs izkīninsenju gaūtun nāuns kliptaswīrds. Jūs mazzi kitawīdina twajs "
-"kliptaswīrds ēntrai repīnts 30min šāi: "
 
 #: src/core/MailProvider.js:106
 #, javascript-format
@@ -484,21 +476,17 @@ msgid ""
 "If you did not request this mail, please just ignore it (the ip that "
 "requested this mail was ${ ip })."
 msgstr ""
-"Ik jūs ni segīwuns izkīninsenis šis pōsti, ka tēr ignōri di (izkīninsenis "
-"tengīnuns ezze ${ ip })."
 
 #: src/core/MailProvider.js:114
 msgid "Mail is not configured on the server"
-msgstr "Pōsti ni ast kōnfiguracijas nō sērweris"
+msgstr ""
 
 #: src/core/MailProvider.js:122
 msgid ""
 "We already sent you a mail with instructions. Please wait before requesting "
 "another mail."
 msgstr ""
-"Mes jāu tengīnusis jūs aīns pōsti sēn palaipīnsnas. Gēidja pirzdau "
-"izkīninsensis kits pōsti."
 
 #: src/core/MailProvider.js:130
 msgid "Couldn't find this mail in our database"
-msgstr "Mazītwei ni aupaltun šis pōsti ēntran nūss dātanbazi"
+msgstr ""

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,12 +160,31 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Coloque píxeis coloridos em um canvas com formato de mapa com outros "
@@ -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,8 +303,17 @@ 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
 msgid "You are not logged in"
@@ -230,56 +324,55 @@ msgstr "Você não está logado."
 msgid "You are not allowed to access this page"
 msgstr "Você não tem acesso a esse canal"
 
-#: src/routes/api/modtools.js:209
+#: 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 "Você não está autenticado."
 
-#: src/routes/api/auth/register.js:27
+#: 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:30
+#: 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:32
+#: 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:55
+#: src/routes/api/auth/register.js:59
 msgid "You took too long, try again."
-msgstr "Você demorou muito, tente novamente."
+msgstr ""
 
-#: src/routes/api/auth/register.js:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
-msgstr "Você errou o seu captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
 msgstr ""
 
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
-msgstr "Erro de Captcha desconhecido"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
 msgstr ""
 
-#: src/routes/api/auth/register.js:92
+#: 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:108
+#: 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"
@@ -317,11 +410,23 @@ 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 ""
 
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -337,6 +442,42 @@ 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"
+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 "Você demorou muito, tente novamente."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Você errou o seu captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Erro de Captcha desconhecido"
+
+#: 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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Terra"
@@ -378,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"
@@ -394,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."
@@ -401,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
@@ -422,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"
@@ -117,14 +230,15 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 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,381 @@ 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"
+msgstr "Nu ești banat"
 
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
@@ -220,54 +736,10 @@ msgstr "Nu ești conectat"
 msgid "You are not allowed to access this page"
 msgstr "Nu ai voie să accesezi această pagină"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Numai admini pot face asta"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Nu ești banat"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Niciun captcha dat"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-Mailul este deja înregistrat."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Numele de utiizator este deja folosită."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Ți-a luat prea mult, încearcă din nou."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Nu ai trecut captchaul tău"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Eroare de Captcha necunoscută"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Acest furnizor de mail nu este permis"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Nu s-a putut crea un utilizator nou :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Nu s-a putut stabili sesiunea după înregistrare :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Mail verificat"
@@ -308,6 +780,10 @@ msgstr "Parolă incorrectă!"
 msgid "Muted Users can not delete their account."
 msgstr "Utilizator desconectat nu își poate șterge contul."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+msgstr "Acest furnizor de mail nu este permis"
+
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "Utilizatorul desconectat nu poate face asta."
@@ -325,6 +801,38 @@ msgstr "Vei fi redirecționat automatic după 15 secunde"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Sau ${ clickHere } pentru a merge înapoi la pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Niciun captcha dat"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-Mailul este deja înregistrat."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Numele de utiizator este deja folosită."
+
+#: 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 "Nu s-a putut crea un utilizator nou :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Nu s-a putut stabili sesiunea după înregistrare :("
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Pământ"
@@ -592,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,11 +126,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "Всплывающее окно PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr "Ставьте цветные пиксели на огромном полотне с другими людьми по сети"
 
@@ -214,6 +240,10 @@ msgstr "Подтвердите новый пароль"
 msgid "Submit"
 msgstr "Отправить"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Вы не забанены"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Вы не авторизованы"
@@ -222,54 +252,107 @@ msgstr "Вы не авторизованы"
 msgid "You are not allowed to access this page"
 msgstr "У вас нет доступа к этой странице"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Это могут сделать только админы"
 
-#: 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 "Подтверждение почты"
 
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Капча не введена"
+<<<<<<< HEAD
+=======
+#: src/routes/api/auth/verify.js:27
+msgid "You are now verified :)"
+msgstr "Вы прошли проверку :)"
 
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Эта электронная почта уже используется."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Это имя пользователя уже используется."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Слишком долго, попробуйте еще раз."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Вы неправильно решили капчу"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
+#: 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/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Неизвестная ошибка капчи"
+#: src/routes/api/auth/logout.js:11
+msgid "You are not even logged in."
+msgstr "Вы даже не вошли в систему."
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
+#: 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 "Пользователи в муте не могут удалить свой аккаунт."
+
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: 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:92
+#: 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"
+
+#: src/routes/api/auth/register.js:31
+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:108
+#: src/routes/api/auth/register.js:105
 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 "Подтверждение почты"
@@ -307,11 +390,11 @@ msgid "Incorrect password!"
 msgstr "Неверный пароль!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+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 do this."
 msgstr "Пользователи в муте не могут это сделать."
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -327,6 +410,8 @@ msgstr "Вы будете автоматически перенаправлен
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Или ${clickHere}, чтобы вернуться на pixelplanet"
 
+=======
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Земля"
@@ -368,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 ""
 "Наше главное полотно - огромная карта мира, вы можете ставить пиксели где "
 "хотите!"
@@ -383,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 полотне вместе с другими игроками."
 
@@ -391,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"
@@ -413,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-rue.po

@@ -1,507 +0,0 @@
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2024-06-06 07:44+0000\n"
-"Last-Translator: Пробка Топ <topprobka@gmail.com>\n"
-"Language-Team: Rusyn <https://hosted.weblate.org/projects/pixelplanet/server/"
-"rue/>\n"
-"Language: rue\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6-dev\n"
-
-#: src/core/ChatProvider.js:434
-msgid "You can not send chat messages while using a 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 ""
-"Вы єстє постійно замучаны, приєднайте ся до нашого Guilded, жебы подати "
-"апелацію на размучаня"
-
-#: src/core/ChatProvider.js:441
-msgid "You are banned"
-msgstr "Вы заблокованы"
-
-#: src/core/ChatProvider.js:443
-msgid "Your Internet Provider is banned"
-msgstr "Ваш Інтернет-Провайдер заблокован"
-
-#: src/core/ChatProvider.js:448
-#, javascript-format
-msgid "You are muted for another ${ timeMin } minutes"
-msgstr "Вы замучены щи на ${ timeMin } минут"
-
-#: src/core/ChatProvider.js:450
-#, javascript-format
-msgid "You are muted for another ${ ttl } seconds"
-msgstr "Вы замучены щи на ${ ttl } секунд"
-
-#: src/core/ChatProvider.js:467
-#, javascript-format
-msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
-msgstr "Вы одсылаете сообщеня черезміру швытко, вам чекати ${ waitTime }с :("
-
-#: src/core/ChatProvider.js:471
-msgid "You don't have access to this channel"
-msgstr "Вы не мати приступа ид се канал"
-
-#: src/core/ChatProvider.js:490
-msgid "Your mail has to be verified in order to chat"
-msgstr "До общеня у чете ваш мейл довжен быти потверженым"
-
-#: 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 "Просити хосновати int чет"
-
-#: 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
-msgid "Your passwords do not match :("
-msgstr "Ваш парол не совпадати :("
-
-#: src/routes/reset_password.js:77
-msgid "User doesn't exist in our database :("
-msgstr "Хоснователь не єствує на нашей базї податкув :("
-
-#: src/routes/reset_password.js:89
-msgid "Password successfully changed."
-msgstr "Парол успішно помінян."
-
-#: src/routes/reset_password.js:108
-msgid "Invalid url :( Please check your mail again."
-msgstr "Невірный URL :( Прошу, провірити свуй мейл щи раз."
-
-#: 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 "Обтерьханя..."
-
-#: src/ssr/PopUp.jsx:47
-msgid "ppfun"
-msgstr "ppfun"
-
-#: src/ssr/PopUp.jsx:48
-msgid "PixelPlanet.Fun PopUp"
-msgstr "PixelPlanet.Fun Вынуряючый ся Увідоменя"
-
-#: src/ssr/Main.jsx:68
-msgid "PixelPlanet.Fun"
-msgstr "PixelPlanet.Fun"
-
-#: src/ssr/Main.jsx:69
-msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
-"Розміщайте цвітные цятки на верете у стілы мапы заєдно з другыми играчами "
-"онлайн"
-
-#: src/utils/validation.js:17
-msgid "Email can't be empty."
-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 "Емайл довжен содержати @"
-
-#: src/utils/validation.js:29
-msgid "Name can't be empty."
-msgstr "Имня не мочь быти пустым."
-
-#: src/utils/validation.js:30
-msgid "Name must be at least 2 characters long"
-msgstr "Довгота именї довжна содержати маймень 2 літер"
-
-#: src/utils/validation.js:31
-msgid "Name must be shorter than 26 characters"
-msgstr "Довгота именї не довжна пересягати 26 літер"
-
-#: src/utils/validation.js:38
-msgid "Name contains invalid character like @, /, \\ or #"
-msgstr "Имня содержити недопустимый літер, такый як @, /, \\ or #"
-
-#: src/utils/validation.js:53
-msgid "No password given."
-msgstr "Парол не провказан."
-
-#: src/utils/validation.js:56
-msgid "Password must be at least 6 characters long."
-msgstr "Довгота парола довжна составляти маймень 6 літер."
-
-#: src/utils/validation.js:59
-msgid "Password must be shorter than 60 characters."
-msgstr "Парол довжен быти куртше 60 літер."
-
-#: src/ssr/PasswordReset.jsx:20 src/ssr/PasswordReset.jsx:40
-msgid "PixelPlanet.fun Password Reset"
-msgstr "PixelPlanet.fun Парол Очист"
-
-#: 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
-msgid "Reset Password"
-msgstr "Парол Очист"
-
-#: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
-msgid "Click here"
-msgstr "Гойкнути сюды"
-
-#: src/ssr/PasswordReset.jsx:30
-msgid "to go back to pixelplanet"
-msgstr "жебы перейти назад в pixelplanet"
-
-#: src/ssr/PasswordReset.jsx:50
-#, javascript-format
-msgid "Hello ${ name }, you can set your new password here:"
-msgstr "Привіт, ${ name }, вы мочете уставити свуй парол туй:"
-
-#: src/ssr/PasswordReset.jsx:54
-msgid "New Password"
-msgstr "Новый Парол"
-
-#: src/ssr/PasswordReset.jsx:60
-msgid "Confirm New Password"
-msgstr "Потвержуйте Новый Парол"
-
-#: src/ssr/PasswordReset.jsx:65
-msgid "Submit"
-msgstr "Подати"
-
-#: src/routes/api/modtools.js:53
-msgid "You are not logged in"
-msgstr "Вы не зайшли у сістему"
-
-#: src/routes/api/modtools.js:65
-msgid "You are not allowed to access this page"
-msgstr "Вам запрічен доприступ ку сей сторонке"
-
-#: src/routes/api/modtools.js:209
-msgid "Just admins can do that"
-msgstr "То моче зробити лиш адміністраторы"
-
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Вы не выгнаты"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Капча не вводити ся"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Мейл вже примінёван."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Имня вже поуживаюти ся."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "У вас минуло черезміру помного однынї, попробуйте щи раз."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Вы не ввожали свую капчу"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Непозната Хыба ввода Капчи"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Приступ к сему провайдеру мейлу запрічен"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Не упастилось вытворити новыго хоснователя :("
-
-#: src/routes/api/auth/register.js:108
-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
-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"
-
-#: src/canvasesDesc.js:20
-msgid "Earth"
-msgstr "Земля"
-
-#: src/canvasesDesc.js:21
-msgid "Moon"
-msgstr "Місяць"
-
-#: src/canvasesDesc.js:22
-msgid "3D Canvas"
-msgstr "3D Канвас"
-
-#: 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 "1біт"
-
-#: src/canvasesDesc.js:27
-msgid "Top10"
-msgstr "Топ10"
-
-#: src/canvasesDesc.js:28
-msgid "2bit"
-msgstr "2біт"
-
-#: src/canvasesDesc.js:29
-msgid "Minimap"
-msgstr "Мінімапа"
-
-#: src/canvasesDesc.js:32
-msgid "Our main canvas, a huge map of the world. Place anywhere 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 ""
-"Місячный верет. Беспечное місто для малюнков. Ниякых прапоров ци крупного "
-"текста (кедь се не подїл малюнка) ци малюнков розміром понад 1.5тыс. x "
-"1.5тыс цяток."
-
-#: 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 (take the vax)."
-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 ""
-"Спис самішных активных играчів за пережый день. Рейтінґ обновляти ся "
-"каждодено в 00:00 UTC."
-
-#: 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 "Вітайте, ${ name }, до PixelPlamet, прошу, потвердити свуй мейл"
-
-#: src/core/MailProvider.js:67
-#, javascript-format
-msgid "Hello ${ name }"
-msgstr "Привіт ${ name }"
-
-#: 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 ""
-"вітаю в наше маленькое сполочность хоснователей pixelplacers. Обы хосновати "
-"свуй акаунт, вам треба потвердити свуй мейл. Вы мочете зробити се туй: "
-
-#: 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 "Ци копіровав слїдуючый url:"
-
-#: 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 ""
-"Мы уже одослали вам письмо з потвержением, вы мочете запросити щи одно в "
-"промине ${ minLeft } минут."
-
-#: src/core/MailProvider.js:103
-msgid "You forgot your password for PixelPlanet? Get a new one here"
-msgstr "Вы забыли свуй парол од PixelPlanet? Достайте новый туй"
-
-#: 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 ""
-"Вы просили завести новый парол. Вы мочете одмінити свуй парол в промине "
-"слїдуючых 30мин туй: "
-
-#: 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 ""
-"Кедь вы не выжадали сей мейл, прошу, напросто зіґноровайте ёго (ip, з "
-"которыго быво выслано сей мейл ${ ip })."
-
-#: src/core/MailProvider.js:114
-msgid "Mail is not configured on the server"
-msgstr ""
-
-#: src/core/MailProvider.js:122
-msgid ""
-"We already sent you a mail with instructions. Please wait before requesting "
-"another mail."
-msgstr ""
-"Мы вже одослали вам мейл з інструкціями. Прошу, причекайте, передчим "
-"одсылати другый мейл."
-
-#: src/core/MailProvider.js:130
-msgid "Couldn't find this mail in our database"
-msgstr "Не обдержалось найти сей мейл в нашей базе данных"

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,11 +121,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PopUp ri PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Piazza pixel culurata intra na mappa a stili canvas cu avutri chistiana"
@@ -213,6 +235,10 @@ msgstr "Cunfirma a nova password"
 msgid "Submit"
 msgstr "Cunfirma"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "Unsi bannatu"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "Unsi loggatu"
@@ -221,54 +247,15 @@ msgstr "Unsi loggatu"
 msgid "You are not allowed to access this page"
 msgstr "Unna u pirmissu pi trasiri intra sta pagina"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha un ratu"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-Mail gia usata."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Username gia pigghiatu."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Ci mittisti troppu assa, prova arre."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Rixi morto Fallisti u captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Errori rilu captcha sconosciutu"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Stu provider rila email unne valiru"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Falli a criari un novu utenti"
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Falli a fari na sissiuni ropu a registazioni :("
-
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Verifica pi email"
@@ -308,6 +295,11 @@ 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"
+msgstr "Stu provider rila email unne valiru"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
@@ -326,6 +318,98 @@ msgstr "Veni mannatu nala paggina automaticamente 'n 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "O ${ clickHere } Pi gghiri arre su pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "Captcha un ratu"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "E-Mail gia usata."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Username gia pigghiatu."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Ci mittisti troppu assa, prova arre."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Rixi morto Fallisti u captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Errori rilu captcha sconosciutu"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "Falli a criari un novu utenti"
+
+#: src/routes/api/auth/register.js:105
+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"
@@ -367,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"
@@ -383,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"
@@ -390,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
@@ -412,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-sgn.po

@@ -124,11 +124,11 @@ msgstr "👎👎✋🙌👇"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "👎🤞👉🤙👍👎👍✌️👇🤙👋.✋🙌👇 👎👌👎🙌👎"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "👎🤞👉🤙👍👎👍✌️👇🤙👋.✋🙌👇"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "👎👍✌️🤘🤙 🤘👌👍👌☝️ 👎🤞👉🤙👍🖖 👌👇 ✌️👇 👆✌️👎 🖖👋👏👍🤙🤚 🤘✌️👇🤜✌️🖖 👐🤞"
@@ -221,6 +221,10 @@ msgstr "🤘👌👇✋🤞☝️👆 👇🤙👐 👎✌️🖖🖖👐👌☝
 msgid "Submit"
 msgstr "🖖🙌👈👆🤞👋"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "👏👌🙌 ✌️☝️🤙 👇👌👋 👈✌️👇👇🤙🤚"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "👏👌🙌 ✌️☝️🤙 👇👌👋 👍👌🤛🤛🤙🤚 🤞👇"
@@ -229,55 +233,10 @@ msgstr "👏👌🙌 ✌️☝️🤙 👇👌👋 👍👌🤛🤛🤙🤚 🤞
 msgid "You are not allowed to access this page"
 msgstr "👏👌🙌 ✌️☝️🤙 👇👌👋 ✌️👍👍👌👐🤙🤚 👋👌 ✌️🤘🤘🤙🖖🖖 👋🖐🤞🖖 👎✌️🤛🤙"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "✊🙌🖖👋 ✌️🤚👆🤞👇🖖 🤘✌️👇 🤚👌 👋🖐✌️👋"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "👏👌🙌 ✌️☝️🤙 👇👌👋 👈✌️👇👇🤙🤚"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "👇👌 🤘✌️👎👋🤘🖐✌️ 🤛🤞🤜🤙👇"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "🤙-👆✌️🤞👍 ✌️👍☝️🤙✌️🤚👏 🤞👇 🙌🖖🤙."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "🙌🖖🤙☝️👇✌️👆🤙 ✌️👍☝️🤙✌️🤚👏 🤞👇 🙌🖖🤙."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "👏👌🙌 👋👌👌👊 👋👌👌 👍👌👇🤛, 👋☝️👏 ✌️🤛✌️🤞👇."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "👏👌🙌 ✋✌️🤞👍🤙🤚 👏👌🙌☝️ 🤘✌️👎👋🤘🖐✌️"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "🙌👇👊👇👌👐👇 🤘✌️👎👋🤘🖐✌️ 🤙☝️☝️👌☝️"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "👋🖐🤞🖖 🤙👆✌️🤞👍 👎☝️👌🤜🤞🤚🤙☝️ 🤞🖖 👇👌👋 ✌️👍👍👌👐🤙🤚"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "✋✌️🤞👍🤙🤚 👋👌 🤘☝️🤙✌️👋🤙 👇🤙👐 🙌🖖🤙☝️ 😔"
-
-#: src/routes/api/auth/register.js:108
-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 "👆✌️🤞👍 🤜🤙☝️🤞✋🤞🤘✌️👋🤞👌👇"
@@ -318,6 +277,10 @@ msgstr ""
 msgid "Muted Users can not delete their account."
 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/change_mail.js:62
 msgid "Muted Users can not do this."
 msgstr "👆🙌👋🤙🤚 🙌🖖🤙☝️🖖 🤘✌️👇 👇👌👋 🤚👌 👋🖐🤞🖖."
@@ -335,6 +298,39 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+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 ""
+"✋✌️🤞👍🤙🤚 👋👌 🤙🖖👋✌️👈👍🤞🖖🖐 🖖🤙🖖🖖🤞👌👇 ✌️✋👋🤙☝️ ☝️🤙🤛🤞🖖👋🤙☝️ 😔"
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "🤙✌️☝️👋🖐"

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 ""
@@ -121,12 +144,13 @@ msgstr ""
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 #, fuzzy
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.fun"
 
-#: src/ssr/Main.jsx:69
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Postavite barvne piksle na kanvas v obliki zemljevida z drugimi igralci na "
@@ -219,6 +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"
@@ -229,56 +261,55 @@ msgstr "Niste vpisani."
 msgid "You are not allowed to access this page"
 msgstr "Nimate dostopa do tega kanala"
 
-#: src/routes/api/modtools.js:209
+#: 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 "Niste preverjeni."
 
-#: src/routes/api/auth/register.js:27
+#: 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:30
+#: 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:32
+#: 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:55
+#: 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:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
 msgstr "Ni vam uspelo narediti captcho"
 
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
 msgstr "Neznana Napaka Captche"
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
+#: 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:108
+#: 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"
@@ -317,11 +348,23 @@ 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 ""
 
+#: 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/change_mail.js:62
 msgid "Muted Users can not do this."
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 msgstr ""
 
 #: src/ssr/RedirectionPage.jsx:19
@@ -337,6 +380,42 @@ 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"
+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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemlja"
@@ -378,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"
 
@@ -392,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"
@@ -399,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
@@ -420,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-sq.po

@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-04-16 07:23+0000\n"
-"Last-Translator: Reee Tard <hailhailhail1488@gmail.com>\n"
-"Language-Team: Saxon (Upper) <https://hosted.weblate.org/projects/"
-"pixelplanet/server/sxu/>\n"
-"Language: sxu\n"
+"PO-Revision-Date: 2024-04-04 20:02+0000\n"
+"Last-Translator: Lek Plepi <lekplepi350@gmail.com>\n"
+"Language-Team: Albanian <https://hosted.weblate.org/projects/pixelplanet/"
+"server/sq/>\n"
+"Language: sq\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
@@ -12,99 +12,101 @@ msgstr ""
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
-msgstr "Du kanns keng Chat Nohriichten schecken wann du en Proxy benotzt"
+msgstr "Nuk mundesh të dërgosh mesazhe në bisedë ndërkohë që ti përdor proxy"
 
 #: src/core/ChatProvider.js:436
 msgid "Your country is temporary muted from this chat channel"
-msgstr "Däi Land ass viruierëmig stummgeschalt vun dësem Chatkanal"
+msgstr "Shteti juaj është i bllokuar për momentin nga biseda"
 
 #: src/core/ChatProvider.js:439
 msgid "You are permanently muted, join our guilded to appeal the mute"
 msgstr ""
-"Du bass fir ëmmer gestëmmt, trëtt eisem Guilded bei fir d'Mut ze äppellen"
+"Ti je i ndalur që të shkruash përgjithmonë, bashkohu në guilded tonë që te "
+"raportosh bllokimin nga biseda"
 
 #: src/core/ChatProvider.js:441
 msgid "You are banned"
-msgstr "Du bass gespaart"
+msgstr "Ti je i ndaluar nga loja"
 
 #: src/core/ChatProvider.js:443
 msgid "Your Internet Provider is banned"
-msgstr "Däin Internet Anbittär ass gespaart"
+msgstr "Ofruesi juaj i internetit është i ndaluar"
 
 #: src/core/ChatProvider.js:448
 #, javascript-format
 msgid "You are muted for another ${ timeMin } minutes"
-msgstr "Du bass fir wäitert ${ timeMin } Minutten gestëmmt"
+msgstr "Ti je i heshtur dhe për disa ${timeMin} minuta"
 
 #: src/core/ChatProvider.js:450
 #, javascript-format
 msgid "You are muted for another ${ ttl } seconds"
-msgstr "Du bass fir wäitert ${ ttl } Sekonnen gestëmmt"
+msgstr "Ti je i heshtur për ${ ttl } sekonda"
 
 #: src/core/ChatProvider.js:467
 #, javascript-format
 msgid "You are sending messages too fast, you have to wait ${ waitTime }s :("
-msgstr "Du schecks Nachrichten ze seier, du muss ${ waitTime }s wåarde"
+msgstr ""
+"Ti po dërgon mesazhe shumë shpejtë, ti duhësh te presësh ${ waitTime }s :("
 
 #: src/core/ChatProvider.js:471
 msgid "You don't have access to this channel"
-msgstr "Du hues keng Zougang zu dësem Kanal"
+msgstr "Ti nuk ke akses tek ky kanal"
 
 #: src/core/ChatProvider.js:490
 msgid "Your mail has to be verified in order to chat"
-msgstr "Däi E-Mail muss verifizeiert sinn fir ze chatten"
+msgstr "Email i yti duhet të verifikohet nesë doni të shkruani"
 
 #: src/core/ChatProvider.js:500
 msgid "You can't send a message this long :("
-msgstr "Du kanns keng Nohriicht sou laang schecken :("
+msgstr "Ti nuk mund të dërgosh një mesazh kaq të gjatë :("
 
 #: src/core/ChatProvider.js:504
 msgid "Please use int channel"
-msgstr "Gëf int Kanal bäi"
+msgstr "Të lutem perdorni kanalin int"
 
 #: src/core/ChatProvider.js:512
 msgid "Stop flooding."
-msgstr "Halt op ze fluederen."
+msgstr "Mos përmbysni."
 
 #: src/routes/reset_password.js:39
 msgid "You sent an empty password or invalid data :("
-msgstr ""
+msgstr "Ju dërguat nje password bosh ose data invalide :("
 
 #: src/routes/reset_password.js:51
 msgid "This password-reset link isn't valid anymore :("
-msgstr ""
+msgstr "Ky password-reset link nuk është më valid :("
 
 #: src/routes/reset_password.js:62
 msgid "Your passwords do not match :("
-msgstr ""
+msgstr "Passwordet tuaja nuk janë njësoj :("
 
 #: src/routes/reset_password.js:77
 msgid "User doesn't exist in our database :("
-msgstr ""
+msgstr "Ky user nuk eziston ne database tonë"
 
 #: src/routes/reset_password.js:89
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Passwordi është ndryshuar me sukses."
 
 #: src/routes/reset_password.js:108
 msgid "Invalid url :( Please check your mail again."
-msgstr ""
+msgstr "Url invalide :( Ju lutëm rishikoni mail tuaj përsëri."
 
 #: src/ssr/Globe.jsx:37
 msgid "PixelPlanet.Fun 3DGlobe"
-msgstr ""
+msgstr "PixelPlanet.Fun Globi 3D"
 
 #: src/ssr/Globe.jsx:38
 msgid "A 3D globe of our whole map"
-msgstr ""
+msgstr "Nje glob 3D i të gjithë hartës tonë"
 
 #: src/ssr/Globe.jsx:51
 msgid "Double click on globe to go back."
-msgstr ""
+msgstr "Shtypni globin dy herë që të riktheheni"
 
 #: src/ssr/Globe.jsx:52
 msgid "Loading..."
-msgstr ""
+msgstr "Po shkarkohet…"
 
 #: src/ssr/PopUp.jsx:47
 msgid "ppfun"
@@ -112,59 +114,59 @@ msgstr "ppfun"
 
 #: src/ssr/PopUp.jsx:48
 msgid "PixelPlanet.Fun PopUp"
-msgstr ""
+msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
-msgstr ""
+msgstr "Vendosni piksela në një canvas si stil harte me lojtarë të tjerë online"
 
 #: src/utils/validation.js:17
 msgid "Email can't be empty."
-msgstr ""
+msgstr "Email nuk mund të jetë bosh."
 
 #: src/utils/validation.js:18
 msgid "Email should be at least 5 characters long."
-msgstr "E-Mail soll zolässseglesch 5 Zeechen laang sinn."
+msgstr "Email duhet të jetë minimumi 5 shkronja i gjatë."
 
 #: src/utils/validation.js:19
 msgid "Email can't be longer than 40 characters."
-msgstr "E-Mail kann net mei wei 40 Zeechen laang sinn."
+msgstr "Email nuk mundet të jetë më i gjatë se 40 shkronja."
 
 #: src/utils/validation.js:20
 msgid "Email should at least contain a dot"
-msgstr "E-Mail soll zolässseglesch e Punkt enthalen"
+msgstr "Email duhet të ketë të paktën një pikë"
 
 #: src/utils/validation.js:22
 msgid "Email should contain a @"
-msgstr ""
+msgstr "Email duhet të përmbajë një @"
 
 #: src/utils/validation.js:29
 msgid "Name can't be empty."
-msgstr ""
+msgstr "Emri nuk mundet të jetë bosh."
 
 #: src/utils/validation.js:30
 msgid "Name must be at least 2 characters long"
-msgstr ""
+msgstr "Emri duhet të jetë të paktën 2 shkronja i gjatë"
 
 #: src/utils/validation.js:31
 msgid "Name must be shorter than 26 characters"
-msgstr ""
+msgstr "Emri duhet te jetë me i shkurtër se 26 shkronja"
 
 #: src/utils/validation.js:38
 msgid "Name contains invalid character like @, /, \\ or #"
-msgstr ""
+msgstr "Emri përmban shkronja invalide si @,/,\\ ose #"
 
 #: src/utils/validation.js:53
 msgid "No password given."
-msgstr ""
+msgstr "Nuk ka password të dhënë."
 
 #: src/utils/validation.js:56
 msgid "Password must be at least 6 characters long."
-msgstr ""
+msgstr "Password duhet të jetë të paktën 6 shkronja i gjatë."
 
 #: src/utils/validation.js:59
 msgid "Password must be shorter than 60 characters."
@@ -185,7 +187,7 @@ msgstr ""
 
 #: src/ssr/PasswordReset.jsx:30 src/ssr/RedirectionPage.jsx:12
 msgid "Click here"
-msgstr "Klick hei"
+msgstr ""
 
 #: src/ssr/PasswordReset.jsx:30
 msgid "to go back to pixelplanet"
@@ -208,6 +210,10 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr ""
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr ""
@@ -216,54 +222,10 @@ msgstr ""
 msgid "You are not allowed to access this page"
 msgstr ""
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr ""
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr ""
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Keng Captcha ginn"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "E-Mail schonn am Gebrauch."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Benotzernumm schonn am Gebrauch."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Du hues ze laang geholl, versich et erëm."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr ""
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr ""
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr ""
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr ""
-
-#: src/routes/api/auth/register.js:108
-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 ""
@@ -284,7 +246,7 @@ msgstr ""
 
 #: src/routes/api/auth/delete_account.js:65 src/routes/api/auth/logout.js:20
 msgid "Server error when logging out."
-msgstr "Server Fehler beim Ausloggen."
+msgstr ""
 
 #: src/routes/api/auth/change_mail.js:44
 #: src/routes/api/auth/change_passwd.js:34
@@ -296,11 +258,15 @@ msgstr ""
 #: src/routes/api/auth/change_passwd.js:43
 #: src/routes/api/auth/delete_account.js:55
 msgid "Incorrect password!"
-msgstr "Falscht Passwuert!"
+msgstr ""
 
 #: src/routes/api/auth/delete_account.js:46
 msgid "Muted Users can not delete their account."
-msgstr "Gespäerte Benotzer kënnen hier Kont net läschen."
+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/change_mail.js:62
 msgid "Muted Users can not do this."
@@ -319,68 +285,95 @@ msgstr ""
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr ""
 
+#: src/routes/api/auth/register.js:31
+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 ""
+
 #: src/canvasesDesc.js:20
 msgid "Earth"
-msgstr "Äerd"
+msgstr ""
 
 #: src/canvasesDesc.js:21
 msgid "Moon"
-msgstr "Mound"
+msgstr ""
 
 #: src/canvasesDesc.js:22
 msgid "3D Canvas"
-msgstr "3D Keischt"
+msgstr ""
 
 #: src/canvasesDesc.js:23
 msgid "Coronavirus"
-msgstr "Kruhnvirus"
+msgstr ""
 
 #: src/canvasesDesc.js:24
 msgid "PixelZone"
-msgstr "PixelZone"
+msgstr ""
 
 #: src/canvasesDesc.js:25
 msgid "PixelCanvas"
-msgstr "PixelKeischt"
+msgstr ""
 
 #: src/canvasesDesc.js:26
 msgid "1bit"
-msgstr "1bit"
+msgstr ""
 
 #: src/canvasesDesc.js:27
 msgid "Top10"
-msgstr "Top10"
+msgstr ""
 
 #: src/canvasesDesc.js:28
 msgid "2bit"
-msgstr "2bit"
+msgstr ""
 
 #: src/canvasesDesc.js:29
 msgid "Minimap"
-msgstr "Minikaart"
+msgstr ""
 
 #: src/canvasesDesc.js:32
 msgid "Our main canvas, a huge map of the world. Place anywhere you like!"
 msgstr ""
-"Eis Happtkeischt, eng gewalteg Kaart vun der Welt. Plaatz iwwerall wou dir "
-"wëllt!"
 
 #: 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 ""
-"Mound keischt. Sécheren Plaz fir Konscht. Keng Fändere oder grouss Texter "
-"(esoufir net deel vun der Konscht) oder Konscht déi méi gréisst ass wéi 1.5k "
-"x 1.5k Pixel."
 
 #: src/canvasesDesc.js:34
 msgid "Place Voxels on a 3D canvas with others."
-msgstr "Plaatz Voxelen op enger 3D-Keischt mat anere."
+msgstr ""
 
 #: src/canvasesDesc.js:35
 msgid "Special canvas to spread awareness of SARS-CoV2 (take the vax)."
-msgstr "\"Speziell Keischt fir Awarness iwwer SARS-CoV2 (Huelt d'Impfung)."
+msgstr ""
 
 #: src/canvasesDesc.js:36
 msgid "Mirror of PixelZone"
@@ -432,7 +425,7 @@ msgstr ""
 
 #: src/core/MailProvider.js:68 src/core/MailProvider.js:105
 msgid "Or by copying following url:"
-msgstr "Oder enfolgend kopeieren url:"
+msgstr ""
 
 #: src/core/MailProvider.js:69
 msgid ""
@@ -441,7 +434,7 @@ msgstr ""
 
 #: src/core/MailProvider.js:70 src/core/MailProvider.js:107
 msgid "Thanks"
-msgstr "Danke"
+msgstr ""
 
 #: src/core/MailProvider.js:87
 #, javascript-format
@@ -456,7 +449,7 @@ msgstr ""
 
 #: src/core/MailProvider.js:104
 msgid "Hello"
-msgstr "Hallo"
+msgstr ""
 
 #: src/core/MailProvider.js:105
 msgid ""
@@ -483,4 +476,4 @@ msgstr ""
 
 #: src/core/MailProvider.js:130
 msgid "Couldn't find this mail in our database"
-msgstr "Konnte dës E-Mail net an eisem Datebank fannen"
+msgstr ""

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,11 +146,12 @@ msgstr "ppzabava"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
+#: src/ssr/Main.jsx:65
 msgid "PixelPlanet.Fun"
 msgstr "PixelPlanet.Fun"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Postavite bojne piksele na kanvasu koji liči na mapu sa drugim igračima "
@@ -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,8 +281,16 @@ 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"
 msgstr "Niste ulogovani"
@@ -221,54 +299,53 @@ msgstr "Niste ulogovani"
 msgid "You are not allowed to access this page"
 msgstr "Nemate pristup da vidite ovu stranicu"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
+#: 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:30
+#: 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:32
+#: src/routes/api/auth/register.js:36
 msgid "Username already in use."
 msgstr "Ime je već u koristi."
 
-#: src/routes/api/auth/register.js:55
+#: src/routes/api/auth/register.js:59
 msgid "You took too long, try again."
-msgstr "Trebalo ti je previše vremena,probaj opet."
+msgstr "Previše dugo vam je trebalo, pokušajte opet."
 
-#: src/routes/api/auth/register.js:58
+#: src/routes/api/auth/register.js:62
 msgid "You failed your captcha"
-msgstr "Neuspela verifikacija"
+msgstr "Niste uspeli da uradite verifikaciju"
 
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
+#: src/routes/api/auth/register.js:65
 msgid "Unknown Captcha Error"
-msgstr "Nepoznata verifikacijska greška"
+msgstr "Nepoznata greška sa verifikacijom"
 
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Ovaj e-mail provajder nije dostupan"
-
-#: src/routes/api/auth/register.js:92
+#: 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:108
+#: 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"
@@ -306,12 +383,25 @@ 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."
 
+#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:24
+msgid "This email provider is not allowed"
+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"
@@ -326,6 +416,41 @@ 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"
+
+#: 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 "Trebalo ti je previše vremena,probaj opet."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Neuspela verifikacija"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Nepoznata verifikacijska greška"
+
+#: 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/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Zemlja"
@@ -360,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
@@ -370,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) "
@@ -379,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"
@@ -406,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,11 +128,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Fokotuʻu ʻa e lanu ʻo e lanu ʻi ha mape styled fakatataa mo e kau vaʻinga "
@@ -223,6 +245,10 @@ msgstr "Fakapapauʻi ʻa e Lea Fufū Foʻoú"
 msgid "Submit"
 msgstr "Fakahū"
 
+#: src/routes/api/baninfo.js:32
+msgid "You are not banned"
+msgstr "ʻOku ʻikai ke ke banned"
+
 #: src/routes/api/modtools.js:53
 msgid "You are not logged in"
 msgstr "ʻOku ʻikai ke ke hū ki he polokalamá"
@@ -231,54 +257,15 @@ msgstr "ʻOku ʻikai ke ke hū ki he polokalamá"
 msgid "You are not allowed to access this page"
 msgstr "ʻOku ʻikai ngofua ke ke hū ki he peesi ko ʻení"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 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/register.js:27
-msgid "No Captcha given"
-msgstr "ʻIkai ha Captcha ʻe foaki"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Kuo ʻosi fakaʻaongaʻi ʻa e ʻĪ-meilí."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Kuo ʻosi ngāueʻaki ʻe he tokotaha ngāue ki he polokala."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Naʻe fuʻu fuoloa hoʻo feinga."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Naʻe ʻikai ke ke lava hoʻo captcha"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr ""
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Fehalaaki Captcha ʻikai ʻiloʻi"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "ʻOku ʻikai fakangofua ʻa e kautaha ʻimeili ko ʻeni"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "ʻIkai lava ʻo faʻu ha foʻou ki he polokalamá :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "ʻIkai lava ke fokotuʻu ha fakataha hili e lesisita :("
-
+=======
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "Fakapapauʻi ʻo e meilí"
@@ -318,6 +305,11 @@ 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"
+msgstr "ʻOku ʻikai fakangofua ʻa e kautaha ʻimeili ko ʻeni"
 
 #: src/routes/api/auth/change_mail.js:62
 msgid "Muted Users can not do this."
@@ -336,6 +328,98 @@ msgstr "ʻE toe fakafoki fakahangatonu atu koe hili 15s"
 msgid "Or ${ clickHere } to go back to pixelplanet"
 msgstr "Pe ${ clickHere } ke foki ki pixelplanet"
 
+#: src/routes/api/auth/register.js:31
+msgid "No Captcha given"
+msgstr "ʻIkai ha Captcha ʻe foaki"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Kuo ʻosi fakaʻaongaʻi ʻa e ʻĪ-meilí."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Kuo ʻosi ngāueʻaki ʻe he tokotaha ngāue ki he polokala."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Naʻe fuʻu fuoloa hoʻo feinga."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Naʻe ʻikai ke ke lava hoʻo captcha"
+
+#: src/routes/api/auth/register.js:65
+msgid "Unknown Captcha Error"
+msgstr "Fehalaaki Captcha ʻikai ʻiloʻi"
+
+#: src/routes/api/auth/register.js:89
+msgid "Failed to create new user :("
+msgstr "ʻIkai lava ʻo faʻu ha foʻou ki he polokalamá :("
+
+#: src/routes/api/auth/register.js:105
+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"
@@ -377,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"
@@ -393,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"
@@ -400,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
@@ -423,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"
-"PO-Revision-Date: 2024-06-12 10:12+0000\n"
-"Last-Translator: Aurter Ozturk <aurterozturk@gmail.com>\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"
@@ -11,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: src/core/ChatProvider.js:434
 msgid "You can not send chat messages while using a proxy"
@@ -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,11 +129,30 @@ msgstr "ppfun"
 msgid "PixelPlanet.Fun PopUp"
 msgstr "PixelPlanet.Fun PopUp"
 
-#: src/ssr/Main.jsx:68
+<<<<<<< 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"
 
-#: src/ssr/Main.jsx:69
+#: src/ssr/Main.jsx:66
 msgid "Place color pixels on an map styled canvas with other players online"
 msgstr ""
 "Diğer oyuncularla beraber harita tarzı tuvallerde renkli pikseller atın"
@@ -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"
@@ -213,6 +264,15 @@ msgstr "Yeni Parolayı Onayla"
 msgid "Submit"
 msgstr "Onayla"
 
+#: src/routes/api/baninfo.js:32
+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"
@@ -221,54 +281,10 @@ msgstr "Giriş yapmadınız"
 msgid "You are not allowed to access this page"
 msgstr "Bu sayfaya erişiminiz yok"
 
-#: src/routes/api/modtools.js:209
+#: src/routes/api/modtools.js:207
 msgid "Just admins can do that"
 msgstr "Bunu yalnızca yöneticiler yapabilir"
 
-#: src/routes/api/baninfo.js:32
-msgid "You are not banned"
-msgstr "Yasaklı değilsiniz"
-
-#: src/routes/api/auth/register.js:27
-msgid "No Captcha given"
-msgstr "Captcha girilmedi"
-
-#: src/routes/api/auth/register.js:30
-msgid "E-Mail already in use."
-msgstr "Bu e-posta adresi kullanılıyor."
-
-#: src/routes/api/auth/register.js:32
-msgid "Username already in use."
-msgstr "Bu kullanıcı adı kullanılıyor."
-
-#: src/routes/api/auth/register.js:55
-msgid "You took too long, try again."
-msgstr "Çözmeniz çok sürdü, tekrar deneyiniz."
-
-#: src/routes/api/auth/register.js:58
-msgid "You failed your captcha"
-msgstr "Doğrulamayı yanlış çözdünüz"
-
-#: src/routes/api/auth/register.js:61
-msgid "Please refresh the website"
-msgstr "Lütfen sayfayı yenileyin. Sorun düzelecektir."
-
-#: src/routes/api/auth/register.js:64
-msgid "Unknown Captcha Error"
-msgstr "Bilinmeyen Captcha Hatası"
-
-#: src/routes/api/auth/change_mail.js:22 src/routes/api/auth/register.js:70
-msgid "This email provider is not allowed"
-msgstr "Bu e-posta sağlayıcısına izin verilmiyor"
-
-#: src/routes/api/auth/register.js:92
-msgid "Failed to create new user :("
-msgstr "Yeni kullanıcı oluşturulamadı :("
-
-#: src/routes/api/auth/register.js:108
-msgid "Failed to establish session after register :("
-msgstr "Kayıttan sonra oturum oluşturulamadı :("
-
 #: src/routes/api/auth/verify.js:26 src/routes/api/auth/verify.js:35
 msgid "Mail verification"
 msgstr "E-posta adresi doğrulaması"
@@ -288,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
@@ -306,11 +377,23 @@ msgid "Incorrect password!"
 msgstr "Yanlış parola!"
 
 #: src/routes/api/auth/delete_account.js:46
-msgid "Muted Users can not delete their account."
+<<<<<<< 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."
+
+#: 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/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
@@ -326,6 +409,41 @@ 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"
+
+#: src/routes/api/auth/register.js:34
+msgid "E-Mail already in use."
+msgstr "Bu e-posta adresi kullanılıyor."
+
+#: src/routes/api/auth/register.js:36
+msgid "Username already in use."
+msgstr "Bu kullanıcı adı kullanılıyor."
+
+#: src/routes/api/auth/register.js:59
+msgid "You took too long, try again."
+msgstr "Çözmeniz çok sürdü, tekrar deneyiniz."
+
+#: src/routes/api/auth/register.js:62
+msgid "You failed your captcha"
+msgstr "Doğrulamayı yanlış çözdünüz"
+
+#: 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 kullanıcı oluşturulamadı :("
+
+#: src/routes/api/auth/register.js:105
+msgid "Failed to establish session after register :("
+msgstr "Kayıttan sonra oturum oluşturulamadı :("
+
+>>>>>>> 97d87a347bc027c95221111c9312503fc5539d94
 #: src/canvasesDesc.js:20
 msgid "Earth"
 msgstr "Dünya"
@@ -361,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"
@@ -371,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) "
@@ -380,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"
@@ -419,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
@@ -435,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"
@@ -487,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
@@ -504,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"