Skip to content

Commit b84ae1d

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into fix/ses-3230/audio-message-duration
2 parents 07428f5 + a30a0e8 commit b84ae1d

File tree

396 files changed

+14464
-5197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+14464
-5197
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Remember, you can preview this before saving it.
2424
Describe briefly what your pull request changes. Focus on the value provided to users.
2525
2626
Does it address any outstanding issues in this project?
27-
https://github.com/loki-project/loki-messenger/issues?utf8=%E2%9C%93&q=is%3Aissue
27+
https://github.com/session-foundation/session-desktop/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen
2828
Reference an issue with the hash symbol: "#222"
2929
If you're fixing it, use something like "Fixes #222"
3030

.github/workflows/build-binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ jobs:
144144
uses: ncipollo/release-action@v1
145145
with:
146146
tag: v${{ steps.get_version.outputs.VERSION_TAG }}
147+
name: 'Session ${{ steps.get_version.outputs.VERSION_TAG }}'
147148
draft: true
148-
name: 'Draft'
149149
bodyFile: ${{ env.SHOULD_PUBLISH_ALPHA == 'true' && 'build/release-notes-alpha.md' || 'build/release-notes.md' }}
150150
artifacts: 'dist/latest-linux.yml'
151151
allowUpdates: true

_locales/af/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"banUser": "Blokkeer Gebruiker",
122122
"banUserBanned": "Gebruiker verban",
123123
"block": "Blokkeer",
124-
"blockBlockedDescription": "Deblokkeer hierdie kontak om 'n boodskap te stuur.",
125124
"blockBlockedNone": "Geen geblokkeerde kontakte",
126125
"blockBlockedUser": "{name} Geblokkeer",
127126
"blockDescription": "Is jy seker jy wil <b>{name} blokkeer?</b> Geblokkeerde gebruikers kan nie vir jou boodskapversoeke stuur, groepuitnodigings stuur of jou bel nie.",
@@ -778,6 +777,7 @@
778777
"warning": "Waarskuwing",
779778
"window": "Venster",
780779
"yes": "Ja",
781-
"you": "Jy"
780+
"you": "Jy",
781+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
782782
}
783783

_locales/ar/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
"banUser": "منع المستخدم",
136136
"banUserBanned": "تم منع المستخدم",
137137
"block": "حظر",
138-
"blockBlockedDescription": "إلغاء حظر جهة الإتصال لإرسال رسالة",
139138
"blockBlockedNone": "لا توجد جهات اتصال محظورة",
140139
"blockBlockedUser": "تم حظر {name}",
141140
"blockDescription": "هل أنت متأكد من حظر <b>{name}؟</b> المستخدمين المحظورين لا يمكنهم إرسال طلبات الرسائل، دعوات المجموعات أو الاتصال بك.",
@@ -836,6 +835,7 @@
836835
"warning": "تحذير",
837836
"window": "نافذة",
838837
"yes": "نعم",
839-
"you": "أنت"
838+
"you": "أنت",
839+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
840840
}
841841

_locales/az/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
"banUserBanned": "İstifadəçi yasaqlandı",
143143
"banUserDescription": "Ban etdiyiniz istifadəçinin Hesab ID-sini daxil edin",
144144
"block": "Əngəllə",
145-
"blockBlockedDescription": "Mesaj göndərmək üçün bu kontaktı əngəldən çıxardın.",
146145
"blockBlockedNone": "Əngəllənmiş kontakt yoxdur",
147146
"blockBlockedUser": "{name} əngəlləndi",
148147
"blockDescription": "<b>{name}</b> əngəllənsin? Əngəllənmiş istifadəçilər sizə mesaj tələbi, qrup dəvəti göndərə və ya sizə zəng edə bilməz.",
@@ -884,6 +883,7 @@
884883
"warning": "Xəbərdarlıq",
885884
"window": "Pəncərə",
886885
"yes": "Bəli",
887-
"you": "Siz"
886+
"you": "Siz",
887+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
888888
}
889889

_locales/bal/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"banUser": "صارف کو پابندی لگائیں",
122122
"banUserBanned": "صارف پر پابندی عائد کر دی گئی",
123123
"block": "رکاوٹ",
124-
"blockBlockedDescription": "پیغام بھیجنے کے لئے اس رابطہ کو غیر بلاک کریں۔",
125124
"blockBlockedNone": "هیچں بندکرتگ امدیدبونه یافت نه بیت",
126125
"blockBlockedUser": "{name} کو روکا گیا",
127126
"blockDescription": "کیا آپ یقیناً <b>{name}</b> کو بلاک کرنا چاہتے ہیں؟ بلاک شدہ صارفین آپ کو پیغام کی درخواستیں، گروپ دعوتیں نہیں بھیجیں گے یا آپ کو کال نہیں کریں گے۔",
@@ -778,6 +777,7 @@
778777
"warning": "انتباہ",
779778
"window": "ونڈو",
780779
"yes": "ہاں",
781-
"you": "شما"
780+
"you": "شما",
781+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
782782
}
783783

_locales/be/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"banUser": "Забараніць карыстальніка",
122122
"banUserBanned": "Карыстальнік забаронены",
123123
"block": "Заблакіраваць",
124-
"blockBlockedDescription": "Разблакуйце гэты кантакт, каб адправіць паведамленне.",
125124
"blockBlockedNone": "Няма заблакіраваных кантактаў",
126125
"blockBlockedUser": "Заблакавана {name}",
127126
"blockDescription": "Вы ўпэўненыя, што жадаеце заблакіраваць <b>{name}?</b> Заблакіраваныя карыстальнікі не могуць адпраўляць вам запыты на паведамленні, запрашэнні ў групы ці тэлефанаваць вам.",
@@ -778,6 +777,7 @@
778777
"warning": "Папярэджанне",
779778
"window": "Акно",
780779
"yes": "Так",
781-
"you": "Вы"
780+
"you": "Вы",
781+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
782782
}
783783

_locales/bg/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"banUser": "Забрана на потребител",
122122
"banUserBanned": "Потребителят е забранен",
123123
"block": "Блокиране",
124-
"blockBlockedDescription": "Отблокирай този контакт за да изпратиш съобщение.",
125124
"blockBlockedNone": "Няма блокирани контакти",
126125
"blockBlockedUser": "Блокиран {name}",
127126
"blockDescription": "Сигурен ли/ли сте, че искате да блокирате <b>{name}</b>? Блокираните потребители не могат да ви изпращат заявки за съобщения, покани за група или да ви се обаждат.",
@@ -778,6 +777,7 @@
778777
"warning": "Предупреждение",
779778
"window": "Прозорец",
780779
"yes": "Да",
781-
"you": "Ти"
780+
"you": "Ти",
781+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
782782
}
783783

_locales/bn/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"banUser": "ব্যবহারকারীকে ব্যান করুন",
122122
"banUserBanned": "ইউজার ব্যান করা হয়েছে",
123123
"block": "ব্লক",
124-
"blockBlockedDescription": "মেসেজ পাঠাতে এই কন্টাক্টটি আনব্লক করুন।",
125124
"blockBlockedNone": "কোনো ব্লক করা যোগাযোগ নেই",
126125
"blockBlockedUser": "{name} কে ব্লক করবেন",
127126
"blockDescription": "আপনি কি নিশ্চিত যে আপনি <b>{name}</b> কে ব্লক করতে চান? ব্লক করা ব্যবহারকারীরা আপনাকে বার্তা অনুরোধ, গ্রুপ আমন্ত্রণ বা কল করতে পারবেন না।",
@@ -778,6 +777,7 @@
778777
"warning": "Warning",
779778
"window": "Window",
780779
"yes": "হ্যাঁ",
781-
"you": "তুমি"
780+
"you": "তুমি",
781+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
782782
}
783783

_locales/ca/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
"banUser": "Bloquejar usuari",
135135
"banUserBanned": "Usuari exclòs",
136136
"block": "Bloqueu",
137-
"blockBlockedDescription": "Desbloca aquest contacte per a enviar-li un missatge.",
138137
"blockBlockedNone": "No hi ha contactes bloquejats",
139138
"blockBlockedUser": "Bloquejat {name}",
140139
"blockDescription": "Esteu segur que voleu blocar <b>{name}?</b> Els usuaris bloquejats no us poden enviar sol·licituds de missatges, invitacions de grups ni trucar-vos.",
@@ -817,6 +816,7 @@
817816
"warning": "Avís",
818817
"window": "Finestra",
819818
"yes": "",
820-
"you": "Vós"
819+
"you": "Vós",
820+
"sessionNetworkDataPrice": "Price data powered by CoinGecko<br/>Accurate at {date_time}"
821821
}
822822

0 commit comments

Comments
 (0)