Skip to content

Commit

Permalink
Merge pull request #132 from Psiphon-Inc/next-release
Browse files Browse the repository at this point in the history
Next release
  • Loading branch information
adamkruger authored Apr 8, 2024
2 parents aeb4745 + 14745ca commit 29ad2fa
Show file tree
Hide file tree
Showing 48 changed files with 2,127 additions and 153 deletions.
Binary file modified src/3rdParty/psiphon-tunnel-core.exe
Binary file not shown.
32 changes: 32 additions & 0 deletions src/webui/_locales/am/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "ላትቪያ",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "ኢንዶኔዝያ",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "New Zealand",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "Greece",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "Croatia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "Portugal",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "Ukraine",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "ኮሎምቢያ",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "Malaysia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon በተለያዩ ሃገራት አገልጋዮች አሉት። አሁን ላሉበት ሃገር ቅርብ የሆነ፣ የPsiphon አገልጋይ ያለበትን ሃገር መጠቀም አብዛኛውን ግዜ የተሻለ የአውታረመረብ ግንኙነት እንዲኖር ያደርጋል፤ ነገር ግን በመረጡት ሀገር ላይ እንደሆኑ መስለው ድረጣቢያን እና አገልግሎቶቹን ማግኘት ይችላሉ።",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down
32 changes: 32 additions & 0 deletions src/webui/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "لاتفيا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "أندونيسيا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "نيوزيلندا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "اليونان",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "كرواتيا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "البرتغال",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "أوكرانيا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "كولومبيا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "ماليزيا",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon لديه خوادم كثيرة في بلدان مختلفة. إستعمال خادم سايفون لبلد قريب من بلدك سيوفر بشكل عام إتصال شبكة أسرع، ولكن ربما تود أن تصل إلى مواقع وخدمات كما لو كنت موجود افتراضيا في بلد أو منطقة معينة.",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down
32 changes: 32 additions & 0 deletions src/webui/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "Latvia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "Indonesia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "New Zealand",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "Greece",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "Croatia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "Portugal",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "Ukraine",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "Colombia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "Malaysia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down
32 changes: 32 additions & 0 deletions src/webui/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "Латвія",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "Indonesia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "New Zealand",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "Greece",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "Croatia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "Portugal",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "Ukraine",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "Colombia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "Malaysia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down
32 changes: 32 additions & 0 deletions src/webui/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "Latvia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "Indonesia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "New Zealand",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "Greece",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "Croatia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "Portugal",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "Ukraine",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "Colombia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "Malaysia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down
32 changes: 32 additions & 0 deletions src/webui/_locales/bo/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "Latvia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "Indonesia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "New Zealand",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "Greece",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "Croatia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "Portugal",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "Ukraine",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "Colombia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "Malaysia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down
34 changes: 33 additions & 1 deletion src/webui/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,38 @@
"message": "Lettland",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
},
"settings#egress-region#select-id": {
"message": "Indonesien",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
},
"settings#egress-region#select-nz": {
"message": "Neuseeland",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
},
"settings#egress-region#select-gr": {
"message": "Griechenland",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
},
"settings#egress-region#select-hr": {
"message": "Kroatien",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
},
"settings#egress-region#select-pt": {
"message": "Portugal",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
},
"settings#egress-region#select-ua": {
"message": "Ukraine",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
},
"settings#egress-region#select-co": {
"message": "Kolumbien",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Colombia will be used."
},
"settings#egress-region#select-my": {
"message": "Malaysia",
"description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Malaysia will be used."
},
"settings#egress-region#description": {
"message": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
"description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."
Expand Down Expand Up @@ -804,7 +836,7 @@
"description": "Text encouraging the user to buy PsiCash (with real money). The word 'PsiCash' must not be translated or transliterated."
},
"psicash#overlay-logging-in": {
"message": "Logging in…",
"message": "Logge ein...",
"description": "Text on a screen shown while the user's log-in request is in progress."
},
"psicash#overlay-logging-out": {
Expand Down
Loading

0 comments on commit 29ad2fa

Please sign in to comment.