Skip to content

Commit e5f3a05

Browse files
authored
Merge branch 'FossifyOrg:main' into master
2 parents b35f515 + 909cd15 commit e5f3a05

File tree

28 files changed

+123
-106
lines changed

28 files changed

+123
-106
lines changed

.github/workflows/foss-release.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/gplay-release.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: PR
22

33
on:
44
pull_request:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
jobs:
88
call-pr-workflow:
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Prepare Release PR
2+
3+
on:
4+
repository_dispatch:
5+
types: [prepare-release]
6+
workflow_dispatch:
7+
8+
jobs:
9+
call-release-pr:
10+
uses: FossifyOrg/.github/.github/workflows/prepare-release-pr.yml@main
11+
secrets: inherit

.github/workflows/release-commenter.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths:
7+
- ".fossify/release-marker.txt"
8+
9+
jobs:
10+
call-release-workflow:
11+
name: Release
12+
uses: FossifyOrg/.github/.github/workflows/release.yml@main
13+
with:
14+
track: ${{ vars.GPLAY_TRACK || 'beta' }}
15+
rollout: ${{ vars.GPLAY_ROLLOUT || '0.05' }}
16+
validate_only: ${{ vars.GPLAY_DRY_RUN == 'true' }}
17+
secrets: inherit

.github/workflows/testing-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Testing build (on PR)
22

33
on:
44
pull_request:
5-
branches: [ master ]
5+
branches: [ main ]
66
types: [ labeled, opened, synchronize, reopened ]
77

88
jobs:

app/src/main/res/values-ca/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,5 @@
8181
<item quantity="many">%d elements marcats</item>
8282
<item quantity="other">%d elements marcats</item>
8383
</plurals>
84-
</resources>
84+
<string name="use_for_this_checklist">Fes servir només en aquesta llista de comprovació</string>
85+
</resources>

app/src/main/res/values-cs/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,5 @@
7777
<string name="this_note_is_linked">Tato poznámka je propojená s místním souborem.</string>
7878
<string name="allow_alarm_automatic_backups">Pro automatické zálohování poznámek prosím udělte aplikaci oprávnění k plánování přesných budíků.</string>
7979
<string name="num_checked_items">%d zaškrtnutých položek</string>
80-
</resources>
80+
<string name="use_for_this_checklist">Použít pouze pro tento seznam</string>
81+
</resources>

app/src/main/res/values-da/strings.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<string name="autosave_notes">Autogem noter</string>
5656
<string name="enable_line_wrap">Aktiver tekstombrydning</string>
5757
<string name="use_incognito_mode">Anvend inkognito-tilstand til tastatur</string>
58-
<string name="move_done_checklist_items">Flyt udførte tjeklistepunkter til bunden</string>
58+
<string name="move_done_checklist_items">Flyt afkrydsede elementer til bunden</string>
5959
<string name="add_new_checklist_items_top">Tilføj nye tjeklistepunkter øverst</string>
6060
<string name="checklist">Tjekliste</string>
6161
<string name="checklists">Tjeklister</string>
@@ -73,4 +73,12 @@
7373
<string name="widget_config">Tak, fordi du bruger Fossify Notes.
7474
\nFor flere apps fra Fossify, kan du besøge fossify.org.</string>
7575
<string name="cannot_load_over_internet">Appen kan ikke indlæse filer over internettet</string>
76+
<string name="this_note_is_linked">Denne note er knyttet til en lokal fil.</string>
77+
<plurals name="num_checked_items">
78+
<item quantity="one">%d afkrydset element</item>
79+
<item quantity="other">%d afkrydsede elementer</item>
80+
</plurals>
81+
<string name="use_for_this_checklist">Brug kun til denne tjekliste</string>
82+
<string name="allow_alarm_automatic_backups">For at sikkerhedskopiere noter automatisk skal du give appen tilladelse til at planlægge nøjagtige alarmer.</string>
83+
<string name="password_protect_note_deletion">Adgangskodebeskyttet notesletning</string>
7684
</resources>

0 commit comments

Comments
 (0)