Skip to content

Commit 0867e2b

Browse files
Joshix-1Joshix-1
authored
Merge branch 'FossifyOrg:master' into master
2 parents d492066 + 19d9dca commit 0867e2b

File tree

28 files changed

+147
-43
lines changed

28 files changed

+147
-43
lines changed

‎.github/workflows/image-minimizer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = async ({github, context}) => {
1818
initialBody = context.payload.comment.body;
1919
} else if (context.eventName == 'issues') {
2020
initialBody = context.payload.issue.body;
21-
} else if (context.eventName == 'pull_request') {
21+
} else if (context.eventName == 'pull_request_target') {
2222
initialBody = context.payload.pull_request.body;
2323
} else {
2424
console.log('Aborting: No body found');
@@ -77,7 +77,7 @@ module.exports = async ({github, context}) => {
7777
repo: context.repo.repo,
7878
body: newBody
7979
});
80-
} else if (context.eventName == 'pull_request') {
80+
} else if (context.eventName == 'pull_request_target') {
8181
console.log('Updating pull request', context.payload.pull_request.number);
8282
await github.rest.pulls.update({
8383
pull_number: context.payload.pull_request.number,

‎.github/workflows/image-minimizer.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ on:
55
types: [created, edited]
66
issues:
77
types: [opened, edited]
8-
pull_request:
8+
pull_request_target:
99
types: [opened, edited]
1010

11-
permissions:
12-
issues: write
13-
pull-requests: write
14-
1511
jobs:
1612
try-minimize:
1713
runs-on: ubuntu-latest
1814

1915
steps:
2016
- uses: actions/checkout@v4
17+
with:
18+
token: ${{ secrets.FOSSIFYBOT_TOKEN }}
2119

2220
- uses: actions/setup-node@v4
2321
with:
@@ -30,6 +28,7 @@ jobs:
3028
uses: actions/github-script@v7
3129
timeout-minutes: 3
3230
with:
31+
github-token: ${{ secrets.FOSSIFYBOT_TOKEN }}
3332
script: |
3433
const script = require('.github/workflows/image-minimizer.js');
3534
await script({github, context});

‎.github/workflows/no-response.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
name: no-response
22

3-
# Both `issue_comment` and `scheduled` event types are required for this Action
4-
# to work properly.
53
on:
6-
issue_comment:
7-
types: [created]
84
schedule:
9-
# Run daily at midnight.
10-
- cron: '0 0 * * *'
11-
12-
permissions:
13-
issues: write
14-
pull-requests: write
5+
- cron: '0 0 * * *' # Runs daily at midnight
6+
workflow_dispatch:
157

168
jobs:
179
noResponse:
1810
runs-on: ubuntu-latest
1911
steps:
20-
- uses: lee-dohm/[email protected]
12+
- uses: actions/stale@v9
2113
with:
22-
token: ${{ github.token }}
14+
repo-token: ${{ secrets.FOSSIFYBOT_TOKEN }}
15+
days-before-stale: -1
2316
# Number of days of inactivity before an issue is closed for lack of response.
24-
daysUntilClose: 14
25-
responseRequiredLabel: waiting for author
17+
days-before-close: 14
18+
only-labels: 'waiting for author'
19+
stale-issue-label: 'waiting for author'
20+
stale-pr-label: 'waiting for author'
21+
remove-stale-when-updated: false
22+
ignore-updates: true
23+
close-issue-message: This issue has been automatically closed due to inactivity. We requested additional information but have not received a response from the original author. Without the requested details, we cannot proceed. If you have or find the information needed, please comment so we can reopen the issue.
24+
close-pr-message: This pull request has been automatically closed due to inactivity. We requested additional information but have not received a response from the original author. Without the requested details, we cannot proceed. If you have the needed information or updates, please reopen the PR or comment so we can continue the review.

‎app/src/main/res/values-hr/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@
4747
<string name="select_alarm_to_dismiss">Odaberi alarm za odbacivanje</string>
4848
<string name="alarm_created">Alarm je stvoren</string>
4949
<string name="select_timer_to_dismiss">Odaberi timer za odbacivanje</string>
50-
</resources>
50+
<string name="timer">Timer</string>
51+
</resources>

‎app/src/main/res/values-ja/strings.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
<string name="sort_by_day_and_alarm_time">曜日とアラーム時刻</string>
1919
<string name="analogue_clock">アナログ時計</string>
2020
<string name="digital_clock">デジタル時計</string>
21-
<string name="alarm_dismissed">アラームが破棄されました</string>
21+
<string name="alarm_dismissed">アラームを消去しました</string>
2222
<string name="no_alarms_found">アラームが見つかりません</string>
2323
<string name="add_alarm">アラームを追加</string>
2424
<string name="no_timers_found">タイマーが見つかりません</string>
2525
<string name="add_timer">タイマーを追加</string>
2626
<string name="upcoming_alarm">今後のアラーム</string>
27-
<string name="timers_notification_msg">タイマーが作動中</string>
28-
<string name="timer_single_notification_label_msg">タイマー %s が作動中</string>
27+
<string name="timers_notification_msg">タイマーが作動しています</string>
28+
<string name="timer_single_notification_label_msg">タイマー %s が作動しています</string>
2929
<string name="new_timer">新しいタイマー</string>
3030
<plurals name="timer_notification_msg">
31-
<item quantity="other">%d 個のタイマーが作動中</item>
31+
<item quantity="other">%d個のタイマーが作動しています</item>
3232
</plurals>
3333
<string name="clock_tab">時計</string>
3434
<string name="alarm_tab">アラーム</string>
@@ -38,4 +38,12 @@
3838
<string name="increase_volume_gradually">音量を徐々に大きくする</string>
3939
<string name="faq_1_title">ストップウォッチのタブでラップタイムの並べ替えを行うにはどうすればよいですか？</string>
4040
<string name="faq_1_text">特定の列をタップすると、その列でラップタイムが並べ替えられます。さらにもう一度タップすると、昇順と降順の切り替えを行えます。</string>
41-
</resources>
41+
<string name="clock">時計</string>
42+
<string name="stopwatch">ストップウォッチ</string>
43+
<string name="start_stopwatch">ストップウォッチを開始</string>
44+
<string name="select_alarm_to_dismiss">消去するアラームを選択してください</string>
45+
<string name="alarm_created">アラームを作成しました</string>
46+
<string name="alarm_snoozed">%sまでスヌーズ中のアラーム</string>
47+
<string name="early_alarm_dismissal">アラームを事前に消去</string>
48+
<string name="select_timer_to_dismiss">消去するタイマーを選択してください</string>
49+
</resources>

‎app/src/main/res/values-nl/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<string name="time_expired">Tijd verstreken</string>
1414
<string name="clock_and_date">Klok en datum</string>
1515
<string name="use_text_shadow">Tekstschaduw gebruiken</string>
16-
<string name="swipe_right_to_dismiss">Veeg naar rechts voor uitzetten, of naar links voor uitstellen.</string>
16+
<string name="swipe_right_to_dismiss">Veeg naar rechts om te sluiten, of naar links om te sluimeren.</string>
1717
<string name="sort_by_creation_order">Aanmaakvolgorde</string>
1818
<string name="sort_by_alarm_time">Wektijd</string>
1919
<string name="sort_by_day_and_alarm_time">Dag en tijd</string>

‎app/src/main/res/values-pt/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@
4848
<string name="faq_1_title">Como posso alterar a ordem das voltas no Cronómetro\?</string>
4949
<string name="faq_1_text">Basta clicar em qualquer uma das colunas e isso fará com que as voltas sejam ordenadas pela coluna especificada. Com cliques adicionais, pode alternar a ordem de entre crescente e decrescente.</string>
5050
<string name="early_alarm_dismissal">Descartar alarme cedo</string>
51-
</resources>
51+
</resources>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<string name="stopwatch_stopped">Секундомер остановлен</string>
1313
<string name="timer_stopped">Таймер остановлен</string>
1414
<string name="max_reminder_duration">Максимальная длительность напоминания</string>
15-
<string name="time_expired">Время вышло</string>
15+
<string name="time_expired">Время истекло</string>
1616
<string name="clock_and_date">Часы и дата</string>
1717
<string name="use_text_shadow">Использовать затенение текста</string>
1818
<string name="swipe_right_to_dismiss">Смахивание вправо — отключить, влево — отложить.</string>
@@ -48,5 +48,5 @@
4848
<string name="show_seconds">Показывать секунды</string>
4949
<string name="increase_volume_gradually">Нарастание громкости</string>
5050
<string name="faq_1_title">Как я могу изменить сортировку кругов во вкладке секундомера?</string>
51-
<string name="faq_1_text">Просто нажмите на любую из колонок, и круги отсортируются по этой колонке. Дополнительными нажатиями можно переключаться между сортировкой по возрастанию и по убыванию.</string>
52-
</resources>
51+
<string name="faq_1_text">Просто нажмите на любой из столбцов, и круги отсортируются по этому столбцу. Дополнительными нажатиями можно переключаться между сортировкой по возрастанию и по убыванию.</string>
52+
</resources>

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33
<string name="app_launcher_name">时钟</string>
44
<string name="time_zone">时区</string>
5-
<string name="vibrate">震动</string>
5+
<string name="vibrate">振动</string>
66
<string name="no_days_selected">未选择哪一天</string>
77
<string name="clock">时钟</string>
88
<string name="timer">定时器</string>
@@ -46,4 +46,4 @@
4646
<string name="increase_volume_gradually">音量渐增</string>
4747
<string name="faq_1_title">秒表页面分段的排序如何更改?</string>
4848
<string name="faq_1_text">只要点击任一栏位，就会依据选定的栏位做排序。再多点一下，还能切换递增或者递减顺序。</string>
49-
</resources>
49+
</resources>

‎app/src/main/res/values-zh-rTW/strings.xml‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_launcher_name">簡易時鐘</string>
3+
<string name="app_launcher_name">時鐘</string>
44
<string name="time_zone">時區</string>
55
<string name="vibrate">震動</string>
66
<string name="no_days_selected">未選擇哪一天</string>
@@ -21,4 +21,29 @@
2121
<string name="increase_volume_gradually">音量漸增</string>
2222
<string name="faq_1_title">碼錶頁面分段的排序如何變更?</string>
2323
<string name="faq_1_text">只要點擊任一欄位，就會依選定的欄位做排序。再多點一下，還能切換遞增或遞減的排序。</string>
24-
</resources>
24+
<string name="early_alarm_dismissal">提早解除鬧鐘</string>
25+
<string name="clock">時鐘</string>
26+
<string name="stopwatch">計時器</string>
27+
<string name="start_stopwatch">開始計時</string>
28+
<string name="alarm_dismissed">解除鬧鐘</string>
29+
<string name="select_timer_to_dismiss">選取要解除的計時器</string>
30+
<string name="select_alarm_to_dismiss">選取要解除的鬧鐘</string>
31+
<string name="alarm_created">已建立鬧鐘</string>
32+
<string name="alarm_snoozed">鬧鐘被 %s 以貪睡延後</string>
33+
<string name="no_alarms_found">找不到鬧鐘</string>
34+
<string name="add_alarm">新增鬧鐘</string>
35+
<string name="no_timers_found">找不到計時器</string>
36+
<string name="add_timer">新增計時器</string>
37+
<string name="upcoming_alarm">即將到來的鬧鐘</string>
38+
<string name="timers_notification_msg">計時器正在運作</string>
39+
<string name="timer_single_notification_label_msg">%s 的計時器正在運作</string>
40+
<string name="new_timer">新的計時器</string>
41+
<plurals name="timer_notification_msg">
42+
<item quantity="other">%d 個計時器正在運作</item>
43+
</plurals>
44+
<string name="sort_by_creation_order">建立順序</string>
45+
<string name="sort_by_alarm_time">鬧鐘時間</string>
46+
<string name="sort_by_day_and_alarm_time">日期與鬧鐘時間</string>
47+
<string name="analogue_clock">類比時鐘</string>
48+
<string name="digital_clock">數位時鐘</string>
49+
</resources>

0 commit comments

Comments
 (0)