mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-30 17:34:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,181 Commits 4 Branches 160 Tags 2.3 GiB
1fd22f6d10
Commit Graph

1804 Commits

Author SHA1 Message Date
Lapis
1fd22f6d10
Small fix bundle_ja.properties (#1992) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix
 2020-05-07 20:17:29 -04:00
TheSlaylord
a0c747407f
Update bundle_ru.properties (#2004) 
Removed experimental tag
 2020-05-07 20:17:21 -04:00
LFlicker
735187e78a
Update bundle_ko.properties (#1986) 
* Update bundle_ko.properties

Typo correction

* Update bundle_ko.properties

* Update bundle_ko.properties

Typo Correction
 2020-05-05 11:06:32 -04:00
Koteyka_by
c920902481
Update bundle_be.properties (#1977) 
Fix a errors in a translate
 2020-05-04 09:09:58 -04:00
xetrov05
c83ae5d34c
Translation to ZH_TW (#1974) 2020-05-03 17:50:57 -04:00
Summet
63d2d32fd8
Update bundle_ru.properties (#1972) 2020-05-03 11:45:41 -04:00
Ali-C-Ila
e7c3c3f199
Update bundle_zh_TW.properties (#1965) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-05-02 10:13:01 -04:00
Lapis
33d9501dd2
Update bundle_ja.properties (#1963) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag
 2020-05-01 23:55:22 -04:00
키에르
211be67e0e
Update bundle_ko.properties (#1948) 2020-05-01 12:24:01 -04:00
Anuken
cdc8d2bfe4 Removed experimental tag 2020-05-01 11:31:25 -04:00
DarkenWizMan
f8a24bc3a1
fixed more misspells, added new words (#1956) 
unit factory and drone changed to lithuanian counterparts
 2020-05-01 10:06:16 -04:00
DarkenWizMan
864d6977ff
fixed mispels, added new words (#1945) 
Removed some capital letters, because in lithuanian names of things don't have capital letters in all words, only first word (unless each word gets it's own row). I was too unsure if I should change machine name capital letters.
Also changed uncorrectly used words.
Added new words.
NOTE: I haven't looked through all stuff, so, I may have missed something.
 2020-04-30 12:34:02 -04:00
Ali-C-Ila
d3c9689fff
Update bundle_zh_TW.properties (#1940) 2020-04-29 10:21:50 -04:00
TheSlaylord
ae472fb03d
Update bundle_ru.properties (#1931) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2020-04-28 15:05:41 -04:00
Kittiskov
58cbfa599a
Update(Not complete yet) (#1381) 
I didn't update all these yet, because I have to sleep (yawn).

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-04-28 14:16:40 -04:00
Daan Breur
40ea1c865d
[LANG] NL Some Small Changes (#1546) 2020-04-28 12:32:09 -04:00
Lapis
1836cf9582
Update bundle_ja.properties (#1930) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-28 12:27:07 -04:00
GioIacca9
eef4137a59
Updated bundle_it to dfcf11f (#1929) 2020-04-28 12:27:00 -04:00
Prosta4okua
ab0cb0c019
Ukrainian translation (#1924) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (fixed)

confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (yet again)

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Стан з гілки master взято

* Оновлено на 26.04.2020

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2020-04-28 12:26:52 -04:00
sk7725
14de9d7f5f
6.0 unit and block Korean Translation #1 (#1936) 2020-04-28 12:25:31 -04:00
Wina
621fa7862c
Updated Spanish Bundle (#1937) 
* Minor fixes

* Added Plastanium Conveyor Translation
 2020-04-28 12:25:11 -04:00
Anuken
1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Lapis
02fbc56137
Update bundle_ja.properties (#1917) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-26 11:08:05 -04:00
Gdeft
9260cdee95
Update in bundle_in_ID.properties (#1913) 
Translated few words to Bahasa and revised some of them too so they sound more standard.
 2020-04-25 13:38:06 -04:00
Lapis
d97d971cf6
Update bundle_ja.properties (#1908) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties
 2020-04-25 13:38:00 -04:00
Anuken
9e0af97cee Merge remote-tracking branch 'origin/master' 2020-04-25 12:30:22 -04:00
Anuken
838e12cc0a stop 2020-04-25 12:30:18 -04:00
sk7725
02394973b0
Fix inconsistencies in Korean Translation (#1912) 
For block, the national institute of korean language(https://www.korean.go.kr/front/onlineQna/onlineQnaView.do?mn_id=216&qna_seq=81761) specifies that the correct translation is 블록, not 블럭. Both translations, despite 블럭 being the wrong translation, are being used. All 블럭 have been changed to 블록.
 2020-04-25 12:24:56 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken
21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken
6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
laohuaji233
37240478b8
Update bundle_zh_CN.properties (#1900) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2020-04-23 11:08:33 -04:00
Álvaro Manzanas
cf69fa1d7c
Update bundle_es.properties (#1899) 
* Update bundle_es.properties

* Update bundle_es.properties
 2020-04-22 16:20:07 -04:00
Kaio Duarte Costa
390b5e3b60
Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a
Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Patrick 'Quezler' Mounier
79a095faa8
Merge branch '6.0' into crater 2020-04-16 20:30:13 +02:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Corby
15750b5eb0
Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Patrick 'Quezler' Mounier
a1d4804fae
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00
Anuken
a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Ali-C-Ila
7d6e8fdcd1
Update bundle_zh_TW.properties (#1876) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-04-16 09:14:36 -04:00
Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
 2020-04-16 12:39:52 +02:00
Patrick 'Quezler' Mounier
424e58ff7d
Merge branch 'master' into crater 2020-04-16 11:20:16 +02:00
Prosta4okua
305632c002
Update bundle_uk_UA.properties (#1871) 2020-04-15 10:36:38 -04:00
Vanguard
18e92f5abf
RU updates (#1866) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Felix Corvus <remint32@yandex.ru>
 2020-04-14 10:04:29 -04:00
Miguel de Dios Matias
a10235d6b0
I18n es tiny fix (#1865) 
* Update some translations into spanish.

* Need a white space between #wave_number and wave word (in spanish).

* Added translation for 'search'.

* Fix translate of 'bleeding edge' is https://www.urbandictionary.com/define.php?term=Bleeding%20edge . It is not a name.

* Fixed some spanish strings about schematic.

* Fixed some translations in spanish.
 2020-04-14 10:04:13 -04:00