Skip to content

Commit

Permalink
Merge branch 'master' into wip-translator
Browse files Browse the repository at this point in the history
  • Loading branch information
Wohlstand committed Apr 29, 2024
2 parents 003ab02 + 045dece commit 0a76dd5
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
config:
- {
name: "x86_64",
os: macos-latest,
os: macos-13,
extra_path: "/Users/StaticQt/5.14.2/bin",
build_type: "Release",
upload_directory: "www/macosx/",
Expand Down
2 changes: 1 addition & 1 deletion Editor/languages/editor_pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2419,7 +2419,7 @@ So, please break these words to avoid this.</li>
</message>
<message>
<source>Right</source>
<translation>Esquerda</translation>
<translation>Direita</translation>
</message>
<message>
<source>Remove</source>
Expand Down
10 changes: 5 additions & 5 deletions Editor/languages/editor_zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4539,7 +4539,7 @@ to enter this warp</source>
<message>
<source>If this setting is enabled, even if this warp leads to another level, the
number of existing and collected stars in the level will not be shown.</source>
<translation>启用此设置后,将不显示已收集
<translation>勾选此项后,将不显示已收集
的星星数量和总星星数量。</translation>
</message>
<message>
Expand Down Expand Up @@ -4667,8 +4667,8 @@ Measured in pixels per 1/65 seconds.</source>
<message>
<source>Target coordinates of player on the world map
when you exit from a level through this warp.</source>
<translation>玩家在大地图上的目标坐标
当您通过此扭曲从关卡退出时。</translation>
<translation>通过传送点离开关卡时
玩家所在的大地图位置。</translation>
</message>
<message>
<source>Y:</source>
Expand All @@ -4690,7 +4690,7 @@ when you exit from a level through this warp.</source>
<source>Entering this warp ends the current level
If this flag is enabled, you can only place a warp entrance.</source>
<translation>进入此传送点时过关。
如果开启此选项,您只能放置入口点。</translation>
如果勾选此选项,您只能放置入口点。</translation>
</message>
<message>
<source>To other level</source>
Expand All @@ -4703,7 +4703,7 @@ If this flag is enabled, you can only place a warp exit.</source>
<translatorcomment>翻译的不怎么样……</translatorcomment>
<translation>防止进入此传送点时使用此出口点。
用于传送到另一关卡。
如果开启此选项,您只能放置出口点。</translation>
如果勾选此选项,您只能放置出口点。</translation>
</message>
<message>
<source>From other level</source>
Expand Down
42 changes: 21 additions & 21 deletions PlayableCalibrator/languages/calibrator_pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
<message>
<location filename="../animator/animation_edit.ui" line="20"/>
<source>Animation editor</source>
<translation type="unfinished"></translation>
<translation>Editor de animações</translation>
</message>
<message>
<location filename="../animator/animation_edit.ui" line="163"/>
<location filename="../animator/animation_edit.ui" line="183"/>
<location filename="../animator/animation_edit.ui" line="238"/>
<source>Add</source>
<translation type="unfinished"></translation>
<translation>Adicionar</translation>
</message>
<message>
<location filename="../animator/animation_edit.ui" line="65"/>
<source>Preview</source>
<translation type="unfinished"></translation>
<translation>Pré-visualizar</translation>
</message>
<message>
<location filename="../animator/animation_edit.ui" line="170"/>
<source>Animation name</source>
<translation type="unfinished"></translation>
<translation>Nome da animmação</translation>
</message>
<message>
<location filename="../animator/animation_edit.ui" line="252"/>
Expand All @@ -34,14 +34,14 @@
<location filename="../animator/animation_edit.ui" line="111"/>
<location filename="../animator/animation_edit.ui" line="134"/>
<source>Set</source>
<translation type="unfinished"></translation>
<translation>Definir</translation>
</message>
<message>
<location filename="../animator/animation_edit.ui" line="206"/>
<location filename="../animator/animation_edit.ui" line="222"/>
<location filename="../animator/animation_edit.ui" line="272"/>
<source>Del</source>
<translation type="unfinished"></translation>
<translation>Apagar</translation>
</message>
<message>
<location filename="../animator/animation_edit.ui" line="190"/>
Expand Down Expand Up @@ -71,83 +71,83 @@
<message>
<location filename="../animator/animation_edit.cpp" line="358"/>
<source>Empty animation name</source>
<translation type="unfinished"></translation>
<translation>Nome da animação vazio</translation>
</message>
<message>
<location filename="../animator/animation_edit.cpp" line="359"/>
<source>Animation name is empty!</source>
<translation type="unfinished"></translation>
<translation>O nome da animação esta vazio!</translation>
</message>
<message>
<location filename="../animator/animation_edit.cpp" line="369"/>
<source>Animation exist</source>
<translation type="unfinished"></translation>
<translation>Animação existente</translation>
</message>
<message>
<location filename="../animator/animation_edit.cpp" line="370"/>
<source>Animation with &apos;%1&apos; name already exist!</source>
<translation type="unfinished"></translation>
<translation>Uma animação com o nome&apos;%1&apos; já existe!</translation>
</message>
</context>
<context>
<name>Animator</name>
<message>
<location filename="../animator/animator.ui" line="14"/>
<source>Animator</source>
<translation type="unfinished"></translation>
<translation>Animador</translation>
</message>
<message>
<location filename="../animator/animator.ui" line="24"/>
<source>Direction</source>
<translation type="unfinished"></translation>
<translation>Direção</translation>
</message>
<message>
<location filename="../animator/animator.ui" line="33"/>
<source>Left</source>
<translation type="unfinished"></translation>
<translation>Esquerda</translation>
</message>
<message>
<location filename="../animator/animator.ui" line="43"/>
<source>Right</source>
<translation type="unfinished"></translation>
<translation>Direita</translation>
</message>
<message>
<location filename="../animator/animator.ui" line="160"/>
<source>Edit animations</source>
<translation type="unfinished"></translation>
<translation>Editar animações</translation>
</message>
<message>
<location filename="../animator/animator.ui" line="125"/>
<source>Frame speed:</source>
<translation type="unfinished"></translation>
<translation>Velocidade do Frame:</translation>
</message>
<message>
<location filename="../animator/animator.ui" line="141"/>
<source>Animation</source>
<translation type="unfinished"></translation>
<translation>Animação</translation>
</message>
</context>
<context>
<name>CalibrationMain</name>
<message>
<location filename="../calibration_main.ui" line="437"/>
<source>Height</source>
<translation type="unfinished"></translation>
<translation>Altura</translation>
</message>
<message>
<location filename="../calibration_main.ui" line="500"/>
<source>Offset relative to player&apos;s back (don&apos;t forget to set left or right direction to define source side)</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Deslocamento relativo a costa do jogador (escolha Esquerda ou Direita para o lado da origem)</translation>
</message>
<message>
<location filename="../calibration_main.ui" line="414"/>
<source>Width</source>
<translation type="unfinished"></translation>
<translation>Largura</translation>
</message>
<message>
<location filename="../calibration_main.ui" line="424"/>
<source>Width of player&apos;s collision box (hitbox)</source>
<translation type="unfinished"></translation>
<translation>Largura da caixa de colisão do jogador (hitbox)</translation>
</message>
<message>
<location filename="../calibration_main.ui" line="516"/>
Expand Down
2 changes: 1 addition & 1 deletion _Misc/glossary/pt_BR.tbx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<body>
<termEntry>
<langSet xml:lang="en"><tig><term>Moondust</term></tig></langSet>
<langSet xml:lang="pt_BR"><tig><term></term></tig></langSet>
<langSet xml:lang="pt_BR"><tig><term>Moondust</term></tig></langSet>
</termEntry>
</body>
</text>
Expand Down

0 comments on commit 0a76dd5

Please sign in to comment.