Skip to content

Commit

Permalink
Merge branch 'master' into formatbar-linewidthguide
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Wootten committed Oct 21, 2023
2 parents 50b5a1f + d9bbcba commit 7c8739d
Show file tree
Hide file tree
Showing 19 changed files with 144 additions and 200 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
image: ghcr.io/elementary/docker:${{ matrix.version }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
apt update
Expand Down Expand Up @@ -46,11 +46,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU for aarch64 emulation
if: ${{ matrix.arch != 'x86_64' }}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

Expand All @@ -73,7 +73,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Lint
run: io.elementary.vala-lint -d .
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
apt-get install git -y
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GIT_USER_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: elementary/actions/release@master
env:
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
Expand Down
4 changes: 3 additions & 1 deletion po/extra/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-21 16:07+0000\n"
"PO-Revision-Date: 2023-08-16 12:08+0000\n"
"Last-Translator: David M <[email protected]>\n"
"Language-Team: Catalan <https://l10n.elementary.io/projects/code/extra/ca/>\n"
"Language: ca\n"
Expand Down Expand Up @@ -230,6 +230,8 @@ msgstr ""
#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
"S'assegura que el projecte actiu a l'inici (inclou carpetes que no siguin "
"git)."

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
4 changes: 2 additions & 2 deletions po/extra/en_GB.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-19 18:07+0000\n"
"PO-Revision-Date: 2023-08-03 05:28+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
"code/extra/en_GB/>\n"
Expand Down Expand Up @@ -216,7 +216,7 @@ msgstr "Ctrl+PageUp and Ctrl+PageDown shortcuts now switch tabs"

#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
msgstr "Ensure active project at startup (include non-git folders)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
6 changes: 4 additions & 2 deletions po/extra/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-25 07:07+0000\n"
"Last-Translator: Corentin Noël <[email protected]>\n"
"PO-Revision-Date: 2023-08-08 09:08+0000\n"
"Last-Translator: Nathan <[email protected]>\n"
"Language-Team: French <https://l10n.elementary.io/projects/code/extra/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -233,6 +233,8 @@ msgstr ""
#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
"Nous nous sommes assurés qu'il y ait un projet actif au lancement (y compris "
"pour les dossiers qui ne sont pas des dépôts git)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
4 changes: 2 additions & 2 deletions po/extra/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-19 18:07+0000\n"
"PO-Revision-Date: 2023-08-03 05:28+0000\n"
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
"Language-Team: Hebrew <https://l10n.elementary.io/projects/code/extra/he/>\n"
"Language: he\n"
Expand Down Expand Up @@ -200,7 +200,7 @@ msgstr "הקיצורים Ctrl+PageUp ו־Ctrl+PageDown מחליפים לשוני

#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
msgstr "וידוא המיזם הפעיל עם ההפעלה (לרבות תיקיות שאינן git)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
9 changes: 5 additions & 4 deletions po/extra/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-19 18:07+0000\n"
"PO-Revision-Date: 2023-08-03 05:28+0000\n"
"Last-Translator: Ryo Nakano <[email protected]>\n"
"Language-Team: Japanese <https://l10n.elementary.io/projects/code/extra/ja/"
">\n"
"Language-Team: Japanese <https://l10n.elementary.io/projects/code/extra/ja/>"
"\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -218,7 +218,8 @@ msgstr "Ctrl+PageUp と Ctrl+PageDown でタブを切り替えできるように

#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
msgstr "起動時にアクティブなプロジェクトを確実に設定するように修正 (非 git "
"管理下のフォルダーも含む)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
3 changes: 2 additions & 1 deletion po/extra/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-25 07:07+0000\n"
"PO-Revision-Date: 2023-08-08 09:08+0000\n"
"Last-Translator: Marcin Serwin <[email protected]>\n"
"Language-Team: Polish <https://l10n.elementary.io/projects/code/extra/pl/>\n"
"Language: pl\n"
Expand Down Expand Up @@ -225,6 +225,7 @@ msgstr "Skróty klawiszowe Ctrl+PageUp i Ctrl+PageDown zmieniają teraz karty"
#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
"Wymuszenie aktywnego folderu przy starcie (włączając w to foldery nie-gitowe)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
10 changes: 4 additions & 6 deletions po/extra/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,25 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2021-07-11 21:53+0000\n"
"Last-Translator: Krammer <vitorcsilva180396@gmail.com>\n"
"PO-Revision-Date: 2023-08-19 14:08+0000\n"
"Last-Translator: Matheus Torres Carvalho <matheustcarvalho@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://l10n.elementary.io/projects/code/"
"extra/pt_BR/>\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: Weblate 4.4.2\n"
"X-Generator: Weblate 4.17\n"
"X-Launchpad-Export-Date: 2017-05-03 06:04+0000\n"

#: data/code.metainfo.xml.in:9
msgid "Code"
msgstr "Code"

#: data/code.metainfo.xml.in:10
#, fuzzy
#| msgid "The editor that works"
msgid "The editor that works for you"
msgstr "O editor que funciona"
msgstr "O editor que funciona para você"

#: data/code.metainfo.xml.in:12
#, fuzzy
Expand Down
8 changes: 4 additions & 4 deletions po/extra/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-19 18:07+0000\n"
"PO-Revision-Date: 2023-08-03 05:28+0000\n"
"Last-Translator: кубик круглый <[email protected]>\n"
"Language-Team: Russian <https://l10n.elementary.io/projects/code/extra/ru/>\n"
"Language: ru\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 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\n"
"X-Launchpad-Export-Date: 2017-05-03 06:04+0000\n"

Expand Down Expand Up @@ -219,7 +219,7 @@ msgstr ""

#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
msgstr "Гарантировать активный проект при запуске (включая не-git папки)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
11 changes: 6 additions & 5 deletions po/extra/uk.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-06-19 18:07+0000\n"
"PO-Revision-Date: 2023-08-03 05:28+0000\n"
"Last-Translator: Ihor Hordiichuk <[email protected]>\n"
"Language-Team: Ukrainian <https://l10n.elementary.io/projects/code/extra/uk/"
">\n"
"Language-Team: Ukrainian <https://l10n.elementary.io/projects/code/extra/uk/>"
"\n"
"Language: uk\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 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\n"
"X-Launchpad-Export-Date: 2017-05-03 06:04+0000\n"

Expand Down Expand Up @@ -222,6 +222,7 @@ msgstr ""
#: data/code.metainfo.xml.in:87
msgid "Ensure active project at startup (include non-git folders)"
msgstr ""
"Забезпечення активності проєкту під час запуску (включно з теками, не з git)"

#: data/code.metainfo.xml.in:88 data/code.metainfo.xml.in:136
#: data/code.metainfo.xml.in:168 data/code.metainfo.xml.in:191
Expand Down
25 changes: 11 additions & 14 deletions po/fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-07-03 13:07+0000\n"
"PO-Revision-Date: 2023-08-27 12:08+0000\n"
"Last-Translator: Jiri Grönroos <[email protected]>\n"
"Language-Team: Finnish <https://l10n.elementary.io/projects/code/code/fi/>\n"
"Language: fi\n"
Expand Down Expand Up @@ -455,24 +455,21 @@ msgstr ""
"tiedoston jonnekin muualle?"

#: src/Services/Document.vala:822
#, fuzzy, c-format
#| msgid "File “%s” was modified by an external application."
#, c-format
msgid "File “%s” was deleted and there are unsaved changes."
msgstr "Tiedostoa “%s” muokattiin toisella sovelluksella."
msgstr "Tiedosto “%s” poistettiin ja siihen on tallentamattomia muutoksia."

#. Check external changes after loading
#. The file has become unwritable while changes are pending
#: src/Services/Document.vala:836
#, fuzzy, c-format
#| msgid "File “%s” was deleted. Do you want to save it anyway?"
#, c-format
msgid "File “%s” does not have write permission."
msgstr "Tiedosto “%s” poistettiin. Haluatko tallentaa sen silti?"
msgstr "Tiedostoon “%s” ei ole kirjoitusoikeutta."

#: src/Services/Document.vala:882
#, fuzzy, c-format
#| msgid "File “%s” was modified by an external application."
#, c-format
msgid "File “%s” was modified by an external application"
msgstr "Tiedostoa “%s” muokattiin toisella sovelluksella."
msgstr "Tiedostoa “%s” muokattiin toisella sovelluksella"

#: src/Services/Document.vala:887
msgid ""
Expand All @@ -488,10 +485,12 @@ msgstr ""
#, c-format
msgid "“%s” can't be saved here. Save a duplicate somewhere else?"
msgstr ""
"Asiakirjaa “%s” ei voi tallentaa tänne. Tallennetaanko kaksoiskappale "
"muualle?"

#: src/Services/Document.vala:916
msgid "Ignore"
msgstr ""
msgstr "Ohita"

#: src/Services/Document.vala:918
msgid "Save Duplicate…"
Expand All @@ -507,11 +506,9 @@ msgstr "Lataa uudelleen"

#: src/Services/Document.vala:972
msgid "Overwrite"
msgstr ""
msgstr "Korvaa"

#: src/Services/Document.vala:975
#, fuzzy
#| msgid "Save the document elsewhere"
msgid "Save Document elsewhere"
msgstr "Tallenna asiakirja muualle"

Expand Down
10 changes: 5 additions & 5 deletions po/hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-07-12 15:07+0000\n"
"PO-Revision-Date: 2023-08-03 05:28+0000\n"
"Last-Translator: TomiOhl <[email protected]>\n"
"Language-Team: Hungarian <https://l10n.elementary.io/projects/code/code/hu/"
">\n"
"Language-Team: Hungarian <https://l10n.elementary.io/projects/code/code/hu/>"
"\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -118,7 +118,7 @@ msgstr "A keresési kifejezés legalább 3 karakter hosszú kell legyen."

#: src/Dialogs/GlobalSearchDialog.vala:83
msgid "Case sensitive:"
msgstr "Kis-nagybetű érzékeny:"
msgstr "Kis-nagybetű érzékenység:"

#: src/Dialogs/GlobalSearchDialog.vala:92
msgid "Use regular expressions:"
Expand Down Expand Up @@ -690,7 +690,7 @@ msgstr "Mindig"

#: src/Widgets/SearchBar.vala:107
msgid "Case Sensitive"
msgstr "Kis-nagybetű érzékeny"
msgstr "Kis-nagybetű érzékenység"

#: src/Widgets/SearchBar.vala:114
msgid "Use Regular Expressions"
Expand Down
4 changes: 2 additions & 2 deletions po/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-01 20:46+0000\n"
"PO-Revision-Date: 2023-07-12 15:07+0000\n"
"PO-Revision-Date: 2023-09-24 01:08+0000\n"
"Last-Translator: Ryo Nakano <[email protected]>\n"
"Language-Team: Japanese <https://l10n.elementary.io/projects/code/code/ja/>\n"
"Language: ja\n"
Expand Down Expand Up @@ -569,7 +569,7 @@ msgstr "行へ移動:"
#, c-format
msgid "%d Space"
msgid_plural "%d Spaces"
msgstr[0] "%d個のスペース"
msgstr[0] "%dスペース"

#: src/Widgets/FormatBar.vala:289
#, c-format
Expand Down
Loading

0 comments on commit 7c8739d

Please sign in to comment.