Merge branch 'master' of github.com:loki-project/loki-messenger-android

oxen-io · Mar 16, 2020 · e4ab8b8 · e4ab8b8
2 parents 11237d2 + 9ba0235
commit e4ab8b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
@@ -675,7 +675,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nowych wiadomości w %2$d rozmowach</string>
   <string name="MessageNotifier_most_recent_from_s">Najnowsza z: %1$s</string>
-  <string name="MessageNotifier_locked_message">Wiadomość zamknięta</string>
+  <string name="MessageNotifier_locked_message">Wiadomość zablokowana</string>
   <string name="MessageNotifier_media_message_with_text">Wiadomość multimedialna: %s</string>
   <string name="MessageNotifier_message_delivery_failed">Nie udało się dostarczyć wiadomości.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>

diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt
@@ -60,7 +60,7 @@ class RegisterActivity : BaseActionBarActivity() {
         termsExplanation.setSpan(object : ClickableSpan() {
 
             override fun onClick(widget: View) {
-                openURL("https://getsession.org/privacy-policy/")
+                openURL("https://getsession.org/legal/#privacy-policy")
             }
         }, 61, 75, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         termsTextView.movementMethod = LinkMovementMethod.getInstance()

diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt
@@ -53,7 +53,7 @@ class RestoreActivity : BaseActionBarActivity() {
         termsExplanation.setSpan(object : ClickableSpan() {
 
             override fun onClick(widget: View) {
-                openURL("https://getsession.org/privacy-policy/")
+                openURL("https://getsession.org/legal/#privacy-policy")
             }
         }, 61, 75, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         termsTextView.movementMethod = LinkMovementMethod.getInstance()