Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: refinedmods/refinedstorage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: cookie5321/refinedstorage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: mc1.11
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 11 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 5, 2017

  1. Create ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 5, 2017
    Copy the full SHA
    12212b3 View commit details

  2. Update ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 5, 2017
    Copy the full SHA
    f46eaf9 View commit details

Commits on Jun 6, 2017

  1. Update ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 6, 2017
    Copy the full SHA
    c75064e View commit details

Commits on Jun 7, 2017

  1. Update ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 7, 2017
    Copy the full SHA
    d6ef536 View commit details

  2. Update ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 7, 2017
    Copy the full SHA
    d905967 View commit details

Commits on Jun 10, 2017

  1. Create ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 10, 2017
    Copy the full SHA
    5abc9e3 View commit details

  2. Create ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 10, 2017
    Copy the full SHA
    ad086c7 View commit details

Commits on Jun 16, 2017

  1. Update ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 16, 2017
    Copy the full SHA
    adf447b View commit details

Commits on Jun 19, 2017

  1. Update ko_kr.lang

    @cookie5321
    cookie5321 authored Jun 19, 2017
    Copy the full SHA
    8437249 View commit details

Commits on Jun 24, 2017

  1. Completed Korean translation

    @cookie5321
    cookie5321 authored Jun 24, 2017
    Copy the full SHA
    4efe561 View commit details

  2. Merge branch 'mc1.12' into mc1.11

    @cookie5321
    cookie5321 authored Jun 24, 2017
    Copy the full SHA
    146271f View commit details
Showing with 21 additions and 23 deletions.
  1. +21 −23 src/main/resources/assets/refinedstorage/lang/ko_kr.lang
44 changes: 21 additions & 23 deletions src/main/resources/assets/refinedstorage/lang/ko_kr.lang
View file
Original file line number Diff line number Diff line change
@@ -15,17 +15,17 @@ gui.refinedstorage:external_storage=외부 저장 포트
gui.refinedstorage:importer=입력 포트
gui.refinedstorage:exporter=출력 포트
gui.refinedstorage:detector=감지기
gui.refinedstorage:solderer=조립
gui.refinedstorage:solderer=조립대
gui.refinedstorage:destructor=파괴기
gui.refinedstorage:constructor=설치기
gui.refinedstorage:relay=중계기
gui.refinedstorage:interface.import=인터페이스 입력
gui.refinedstorage:interface.export=인터페이스 출력
gui.refinedstorage:crafting_monitor=조합 모니터
gui.refinedstorage:wireless_crafting_monitor=무선 조합 모니터
gui.refinedstorage:crafting_monitor.fluids_taking=사용하는 액체
gui.refinedstorage:crafting_monitor.items_crafting=제작하는 아이템
gui.refinedstorage:crafting_monitor.items_processing=가공하는 아이템
gui.refinedstorage:crafting_monitor.fluids_taking=사용할 액체
gui.refinedstorage:crafting_monitor.items_crafting=제작할 아이템
gui.refinedstorage:crafting_monitor.items_processing=가공할 아이템
gui.refinedstorage:crafting_monitor.items_inserting=삽입할 아이템
gui.refinedstorage:crafting_monitor.items_missing=부족한 아이템
gui.refinedstorage:crafting_monitor.machine_in_use=기계가 이미 사용 중임
@@ -36,7 +36,7 @@ gui.refinedstorage:wireless_transmitter=무선 송신기
gui.refinedstorage:wireless_transmitter.distance=%d블럭
gui.refinedstorage:crafter=조합기
gui.refinedstorage:crafter.processing=제작 중
gui.refinedstorage:processing_pattern_encoder=가공 패턴
gui.refinedstorage:processing_pattern_encoder=가공 패턴 제작대
gui.refinedstorage:processing_pattern_encoder.pattern_create=패턴 제작
gui.refinedstorage:filter=필터
gui.refinedstorage:filter.compare_damage=데미지
@@ -49,17 +49,17 @@ gui.refinedstorage:network_transmitter.dimension=월드: %d
gui.refinedstorage:network_transmitter.missing_card=부족한 네트워크 카드
gui.refinedstorage:network_transmitter.missing_upgrade=업그레이드를 넣으세요.
gui.refinedstorage:fluid_interface=액체 인터페이스
gui.refinedstorage:fluid_interface.in=In
gui.refinedstorage:fluid_interface.out=Out
gui.refinedstorage:fluid_interface.in=입력
gui.refinedstorage:fluid_interface.out=출력
gui.refinedstorage:crafting_preview=제작 미리보기
gui.refinedstorage:crafting_preview.to_craft=제작할 아이템: %d
gui.refinedstorage:crafting_preview.available=사용 가능: %d
gui.refinedstorage:crafting_preview.missing=부족: %d
gui.refinedstorage:crafting_preview.circular=Circular dependency!
gui.refinedstorage:crafting_preview.loop=Loop in processing...
gui.refinedstorage:crafting_preview.circular=제작할 아이템이 서로를 필요로 합니다!
gui.refinedstorage:crafting_preview.loop=처리 중..
gui.refinedstorage:crafting_preview.force_start=CTRL + SHIFT를 눌러 강제로 시작할 수 있습니다.
gui.refinedstorage:reader=Reader
gui.refinedstorage:writer=Writer
gui.refinedstorage:reader=수신기
gui.refinedstorage:writer=송신기
gui.refinedstorage:security_manager=보안 관리자
gui.refinedstorage:security_manager.configure=설정
gui.refinedstorage:security_manager.permission.0=보관하기
@@ -98,14 +98,14 @@ misc.refinedstorage:pattern.outputs=출력
misc.refinedstorage:pattern.invalid=잘못된 패턴
misc.refinedstorage:pattern.oredict=Ore Dictionary 사용

misc.refinedstorage:security.no_permission=권한이 없습니다.
misc.refinedstorage:security.no_permission=해당 작업을 실행할 권한이 없습니다.

misc.refinedstorage:start=시작
misc.refinedstorage:clear=초기화
misc.refinedstorage:set=설정
misc.refinedstorage:cancel_all=모두 취소
misc.refinedstorage:priority=우선 순위
misc.refinedstorage:oredict=Oredict
misc.refinedstorage:oredict=Ore Dictionary
misc.refinedstorage:blocking=Blocking

misc.refinedstorage:reader_writer.redstone=레드스톤 강도: %d
@@ -121,7 +121,7 @@ sidebutton.refinedstorage:redstone_mode.2=신호를 받지 않을 때 작동

sidebutton.refinedstorage:grid.view_type=표시
sidebutton.refinedstorage:grid.view_type.0=일반
sidebutton.refinedstorage:grid.view_type.1=제작 가능 아이템만 숨김
sidebutton.refinedstorage:grid.view_type.1=제작 가능 아이템 숨김
sidebutton.refinedstorage:grid.view_type.2=제작 가능 아이템만 표시
sidebutton.refinedstorage:grid.sorting.direction=정렬
sidebutton.refinedstorage:grid.sorting.direction.0=오름차순
@@ -161,8 +161,6 @@ sidebutton.refinedstorage:detector.mode.1=수량과 일치할 때 신호 출력
sidebutton.refinedstorage:detector.mode.2=수량 이상일 때 신호 출력
sidebutton.refinedstorage:detector.mode.3=자동 조합 시 신호 출력

sidebutton.refinedstorage:crafter.triggered_autocrafting=신호 입력 시 자동 조합

sidebutton.refinedstorage:void_excess.items=수량 초과 아이템 자동 제거
sidebutton.refinedstorage:void_excess.fluids=용량 초과 액체 자동 제거
sidebutton.refinedstorage:void_excess.items_fluids=용량 초과 아이템/액체 자동 제거
@@ -194,9 +192,9 @@ block.refinedstorage:exporter.name=출력 포트
block.refinedstorage:detector.name=감지기
block.refinedstorage:machine_casing.name=기계 케이싱
block.refinedstorage:solderer.name=조립대
block.refinedstorage:solderer.tooltip.0=%s에 연결되어야 함.
block.refinedstorage:solderer.tooltip.1=옆에 붙여놓거나
block.refinedstorage:solderer.tooltip.2=연결하세요.
block.refinedstorage:solderer.tooltip.0=%s에 연결되어야 합니다.
block.refinedstorage:solderer.tooltip.1=해당 블럭의 옆에 붙여놓거나
block.refinedstorage:solderer.tooltip.2=케이블로 연결하세요.
block.refinedstorage:destructor.name=파괴기
block.refinedstorage:constructor.name=설치기
block.refinedstorage:storage.0.name=1k 저장 공간
@@ -210,7 +208,7 @@ block.refinedstorage:crafting_monitor.name=조합 모니터
block.refinedstorage:wireless_transmitter.name=무선 송신기
block.refinedstorage:wireless_transmitter.tooltip=%s에 설치되어야 합니다.
block.refinedstorage:crafter.name=조합기
block.refinedstorage:processing_pattern_encoder.name=가공 패턴 기록기
block.refinedstorage:processing_pattern_encoder.name=가공 패턴 제작대
block.refinedstorage:processing_pattern_encoder.tooltip.0=가공 패턴을 만드는 데에만 이용됩니다.
block.refinedstorage:processing_pattern_encoder.tooltip.1=조합 패턴을 제작할 때에는 %s를 사용하세요.
block.refinedstorage:network_receiver.name=네트워크 수신기
@@ -249,7 +247,7 @@ item.refinedstorage:wireless_fluid_grid.1.name=크리에이티브 무선 액체
item.refinedstorage:wireless_crafting_monitor.0.name=무선 제작 모니터
item.refinedstorage:wireless_crafting_monitor.1.name=크리에이티브 무선 제작 모니터
item.refinedstorage:quartz_enriched_iron.name=석영 강화 철
item.refinedstorage:core.0.name=설치 코어
item.refinedstorage:core.0.name=형성 코어
item.refinedstorage:core.1.name=파괴 코어
item.refinedstorage:silicon.name=실리콘
item.refinedstorage:processor.0.name=인쇄된 기본 프로세서
@@ -273,7 +271,7 @@ item.refinedstorage:upgrade.1.name=범위 업그레이드
item.refinedstorage:upgrade.2.name=속도 업그레이드
item.refinedstorage:upgrade.3.name=제작 업그레이드
item.refinedstorage:upgrade.4.name=세트 업그레이드
item.refinedstorage:upgrade.5.name=월드 상호작용 업그레이드
item.refinedstorage:upgrade.5.name=다중 월드 업그레이드
item.refinedstorage:upgrade.6.name=섬세한 손길 업그레이드
item.refinedstorage:upgrade.7.name=행운 업그레이드
item.refinedstorage:storage_housing.name=빈 저장 디스크
@@ -287,4 +285,4 @@ item.refinedstorage:wrench.mode.0=회전
item.refinedstorage:wrench.mode.1=설정
item.refinedstorage:wrench.mode.2=해체
item.refinedstorage:security_card.name=보안 카드
item.refinedstorage:security_card.owner=: %s
item.refinedstorage:security_card.owner=플레이어: %s