Skip to content

Commit

Permalink
Merge branch 'aseprite:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
yixiaco authored Feb 19, 2024
2 parents aa3eec0 + 0134c74 commit 405ab50
Show file tree
Hide file tree
Showing 108 changed files with 2,076 additions and 12,115 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build_type: Release
enable_ui: on
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: ccache
Expand Down
Binary file modified data/fonts/aseprite_font.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/fonts/aseprite_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion data/pref.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Aseprite -->
<!-- Copyright (C) 2018-2023 Igara Studio S.A. -->
<!-- Copyright (C) 2018-2024 Igara Studio S.A. -->
<!-- Copyright (C) 2014-2018 David Capello -->
<preferences>

Expand Down Expand Up @@ -133,6 +133,10 @@
<value id="BILINEAR_MIPMAP" value="2" />
<value id="TRILINEAR_MIPMAP" value="3" />
</enum>
<enum id="AlphaRange">
<value id="EIGHT_BIT" value="0" />
<value id="PERCENTAGE" value="1" />
</enum>
</types>

<global>
Expand Down Expand Up @@ -431,6 +435,10 @@
<option id="window_profile" type="WindowColorProfile" default="WindowColorProfile::MONITOR" />
<option id="window_profile_name" type="std::string" />
</section>
<section id="range">
<option id="alpha" type="AlphaRange" default="AlphaRange::EIGHT_BIT" />
<option id="opacity" type="AlphaRange" default="AlphaRange::PERCENTAGE" />
</section>
<section id="canvas_size">
<option id="trim_outside" type="bool" default="false" />
</section>
Expand Down Expand Up @@ -546,6 +554,7 @@
<option id="ani_dir" type="doc::AniDir" default="doc::AniDir::FORWARD" />
<option id="apply_pixel_ratio" type="bool" default="false" />
<option id="for_twitter" type="bool" default="false" />
<option id="play_subtags" type="bool" default="true" />
</section>
<section id="sprite_sheet">
<option id="defined" type="bool" default="false" />
Expand Down
82 changes: 5 additions & 77 deletions data/strings/README.md
Original file line number Diff line number Diff line change
@@ -1,84 +1,12 @@
# Aseprite Translations

The translation work of Aseprite is a collaboration coordinated
through the following Weblate project:
Aseprite is translated using the following Weblate project:

https://hosted.weblate.org/projects/aseprite/aseprite/

This is only possible thanks to the contribution, help, and good will
of several translators:
You can find all the translations in this other repository:

* Arabic
https://github.com/aseprite/strings

* Mr.k <[email protected]>

* Chinese (Simplified)

* 66six11 <[email protected]>
* SRCat.nana <[email protected]>
* TakWolf <[email protected]>
* 鲸流 <[email protected]>

* Chinese (Traditional)

* Héctor Cortés <[email protected]>

* French

* Grey <[email protected]>
* Nathan <[email protected]>

* German

* Cerno_b <[email protected]>
* inxomnyaa <[email protected]>

* Italian

* Fabiano Caputo <[email protected]>

* Korean

* KESTREL (Kestrel) <[email protected]>
* 정원혁 (William Chung) <[email protected]>
* 프돔 <[email protected]>

* Polish

* Eryk Michalak <[email protected]>
* Jakub Mańczak <[email protected]>
* PxSprite <[email protected]>

* Portuguese

* Murilo Gama <[email protected]>

* Russian

* Aleksey Smirnov <[email protected]>
* Ruslan <[email protected]>

* Spanish

* David Capello <[email protected]>
* Héctor Cortés <[email protected]>

* Ukrainian

* dio.next.door201bade7ea0e4d3c <[email protected]>

A special thanks for the feedback of [TakWolf](https://github.com/TakWolf)
and its [aseprite-quest](https://github.com/aseprite-quest) work to create
an unified package to offer a proper Aseprite UX in different languages.

## License

All the translation work is licensed under the Creative Commons
Attribution 4.0 International License. To view a copy of this license,
visit http://creativecommons.org/licenses/by/4.0/ or send a letter to
Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

## Contact

Please contact the editor, David Capello <[email protected]>, in case
you need some information in this page to be redacted.
The official English strings are from the [`en.ini` file here](https://github.com/aseprite/aseprite/blob/main/data/strings/en.ini),
and this file will be copied to the [strings repository](https://github.com/aseprite/strings/blob/main/en.ini) regularly.
57 changes: 0 additions & 57 deletions data/strings/ar.ini

This file was deleted.

Loading

0 comments on commit 405ab50

Please sign in to comment.