diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConferenceDFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConferenceDFragment.java
index b09c896c4620506da7182db4806f371b7ff89710..b1e178a5512973a0b964260b85458f173cebfb50 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConferenceDFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConferenceDFragment.java
@@ -50,41 +50,6 @@ public class ConferenceDFragment extends DialogFragment implements LoaderManager
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- View rootView = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_conference, null);
-
- /*
- ArrayList<Conference> calls = getArguments().getParcelableArrayList("calls");
- final Conference call_selected = getArguments().getParcelable("call_selected");
-
- mAdapter = new SimpleCallListAdapter(getActivity(), calls);
- ListView list = (ListView) rootView.findViewById(R.id.concurrent_calls);
- list.setAdapter(mAdapter);
- list.setOnItemClickListener(new OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) {
-
- Intent in = new Intent();
-
- in.putExtra("transfer", call_selected);
- in.putExtra("target", mAdapter.getItem(pos));
- getTargetFragment().onActivityResult(getTargetRequestCode(), 0, in);
- dismiss();
- }
- });
- list.setEmptyView(rootView.findViewById(R.id.empty_view));
-
-
-
- final AlertDialog a = new AlertDialog.Builder(getActivity()).setView(rootView).setTitle("Transfer " + call_selected.getParticipants().get(0).getContact())
- .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
-
- dismiss();
- }
- }).create();
-
- return a;*/
return null;
}
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
index 571c86fe6e9fc87f9c292fb52490846d927afb10..5f9958c857de91b60a10096071ddc73ace8f8b17 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
@@ -86,72 +86,6 @@ public class TransferDFragment extends DialogFragment implements LoaderManager.L
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- View rootView = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_transfer, null);
-
- /*
- ArrayList<Conference> calls = getArguments().getParcelableArrayList("calls");
- final SipCall call_selected = getArguments().getParcelable("call_selected");
-
- mAdapter = new SimpleCallListAdapter(getActivity(), calls);
- ListView list = (ListView) rootView.findViewById(R.id.concurrent_calls);
- list.setAdapter(mAdapter);
- list.setOnItemClickListener(new OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) {
-
- Intent in = new Intent();
- in.putExtra("target", mAdapter.getItem(pos));
- in.putExtra("transfer", call_selected);
-
- getTargetFragment().onActivityResult(getTargetRequestCode(), RESULT_TRANSFER_CONF, in);
- dismiss();
- }
- });
- list.setEmptyView(rootView.findViewById(R.id.empty_view));
-
- mEditText = (AutoCompleteTextView) rootView.findViewById(R.id.external_number);
- mEditText.setAdapter(autoCompleteAdapter);
-
- final AlertDialog a = new AlertDialog.Builder(getActivity()).setView(rootView)
- .setTitle("Transfer " + call_selected.getContact().getDisplayName())
- .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int whichButton) {
-
- }
- }).setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int whichButton) {
- getTargetFragment().onActivityResult(getTargetRequestCode(), Activity.RESULT_CANCELED, new Intent());
- dismiss();
- }
- }).create();
-
- a.setOnShowListener(new OnShowListener() {
-
- @Override
- public void onShow(DialogInterface dialog) {
- Button b = a.getButton(AlertDialog.BUTTON_POSITIVE);
- b.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View view) {
- if(mEditText.getText().length() == 0){
- Toast.makeText(getActivity(), "Enter a number to transfer this call", Toast.LENGTH_SHORT).show();
- } else {
- Intent in = new Intent();
- in.putExtra("to_number", mEditText.getText().toString());
- in.putExtra("transfer", call_selected);
- getTargetFragment().onActivityResult(getTargetRequestCode(), RESULT_TRANSFER_NUMBER, in);
- dismiss();
- }
- }
- });
-
- }
- });
- return a;*/
return null;
}
diff --git a/ring-android/app/src/main/res/anim/contact_fadein.xml b/ring-android/app/src/main/res/anim/contact_fadein.xml
deleted file mode 100644
index 3d93ac03ecf323f115ba337c3795afdfaca3ef29..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/anim/contact_fadein.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <alpha
- android:fromAlpha="0.0"
- android:toAlpha="1.0"
- android:interpolator="@android:anim/accelerate_interpolator"
- android:duration="@android:integer/config_shortAnimTime"
- android:repeatCount="0" />
-</set>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/drawable-hdpi/green_lock.png b/ring-android/app/src/main/res/drawable-hdpi/green_lock.png
deleted file mode 100644
index e457c78520df8eb319cd4d1bd7d653d0b99408e2..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-hdpi/green_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-hdpi/red_lock.png b/ring-android/app/src/main/res/drawable-hdpi/red_lock.png
deleted file mode 100644
index 76b5d74445d238323dc07cd2eab802b68e63b93d..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-hdpi/red_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/green_lock.png b/ring-android/app/src/main/res/drawable-mdpi/green_lock.png
deleted file mode 100644
index 94fbc8ead6b07f0540527a286f20e9d15333c13d..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-mdpi/green_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/red_lock.png b/ring-android/app/src/main/res/drawable-mdpi/red_lock.png
deleted file mode 100644
index 3e314bcc1425c56ffc2f3b2f2434e1a2b41b171b..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-mdpi/red_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/green_lock.png b/ring-android/app/src/main/res/drawable-xhdpi/green_lock.png
deleted file mode 100644
index 78689d07e9425bb3781258c16ae83faaa4278099..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xhdpi/green_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/red_lock.png b/ring-android/app/src/main/res/drawable-xhdpi/red_lock.png
deleted file mode 100644
index fe1c887f2593d91221062869eae45c426e0fd4a8..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xhdpi/red_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/green_lock.png b/ring-android/app/src/main/res/drawable-xxhdpi/green_lock.png
deleted file mode 100644
index 31efb97c209cce9002ef8ce680162b40f6948985..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/green_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/red_lock.png b/ring-android/app/src/main/res/drawable-xxhdpi/red_lock.png
deleted file mode 100644
index 75b4d6e668c84c060d50150b2c31428f847642b4..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/red_lock.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable/ic_lock_white.xml b/ring-android/app/src/main/res/drawable/ic_lock_white.xml
deleted file mode 100644
index 15dd36e0354dd73f234e6ee147014eb70f549c18..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/drawable/ic_lock_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"
- android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/ring-android/app/src/main/res/drawable/item_generic_selector.xml b/ring-android/app/src/main/res/drawable/item_generic_selector.xml
deleted file mode 100644
index 231cdf47f176dfddb0047dd1eb39b9b777f12714..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/drawable/item_generic_selector.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_pressed="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/darker_gray" />
-
- <padding android:bottom="@dimen/padding_large" android:left="@dimen/padding_large" android:right="@dimen/padding_large" android:top="@dimen/padding_large" />
- </shape></item>
- <item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/light" />
-
- <padding android:bottom="@dimen/padding_large" android:left="@dimen/padding_large" android:right="@dimen/padding_large" android:top="@dimen/padding_large" />
- </shape></item>
- <item><shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/light" />
-
- <padding android:bottom="@dimen/padding_large" android:left="@dimen/padding_large" android:right="@dimen/padding_large" android:top="@dimen/padding_large" />
- </shape></item>
-
-</selector>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/activity_account_settings.xml b/ring-android/app/src/main/res/layout/activity_account_settings.xml
index 6d1f5dfefdb19582e0144b9bd5530a9dd9e3a97b..8bbf56216c8ef4d2d3fb008302ad8a07fff0cec9 100644
--- a/ring-android/app/src/main/res/layout/activity_account_settings.xml
+++ b/ring-android/app/src/main/res/layout/activity_account_settings.xml
@@ -7,7 +7,6 @@
tools:context=".client.AccountEditionActivity">
<LinearLayout
- android:id="@+id/header_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_primary_light"
diff --git a/ring-android/app/src/main/res/layout/activity_new_conversation.xml b/ring-android/app/src/main/res/layout/activity_new_conversation.xml
deleted file mode 100644
index 4425009f6f72e16fa492fc70c2ea75707dfb4a77..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/activity_new_conversation.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context="cx.ring.client.NewConversationActivity">
-
- <fragment
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:name="cx.ring.fragments.ContactListFragment"
- android:id="@+id/fragment"
- android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- tools:layout="@layout/frag_contact_list" />
-</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/add_new_device_layout.xml b/ring-android/app/src/main/res/layout/add_new_device_layout.xml
index 26b4b6f9db8c080060a12bfa7154155a4b534cbf..7ebddcfbc7ae97336970980f62b301555e7371f5 100644
--- a/ring-android/app/src/main/res/layout/add_new_device_layout.xml
+++ b/ring-android/app/src/main/res/layout/add_new_device_layout.xml
@@ -56,7 +56,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
android:layout_height="wrap_content">
<LinearLayout
- android:id="@+id/fields_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
diff --git a/ring-android/app/src/main/res/layout/dialog_account_restore.xml b/ring-android/app/src/main/res/layout/dialog_account_restore.xml
deleted file mode 100644
index 090a18b4f6d04fbbf14c8d565d67cdd065066490..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/dialog_account_restore.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <EditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="textPassword"
- android:ems="10"
- android:id="@+id/pwd_txt"
- android:layout_gravity="center_horizontal"
- android:hint="@string/account_restore_decryption_password"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
- android:layout_marginTop="8dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/dialog_conference.xml b/ring-android/app/src/main/res/layout/dialog_conference.xml
deleted file mode 100644
index bd293be3d0c839e2f77959916e0f5992d2a7595d..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/dialog_conference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/create_conf"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Create conference with:" />
-
- <ListView
- android:id="@+id/concurrent_calls"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:focusable="true"
- android:focusableInTouchMode="true" />
-
- <TextView
- android:id="@+id/empty_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="No other calls pending"
- android:gravity="center" />
-
-
-</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/dialog_transfer.xml b/ring-android/app/src/main/res/layout/dialog_transfer.xml
deleted file mode 100644
index 76554eb586f5f902282893e2bc3f40af2ea5e7c2..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/dialog_transfer.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/edit_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/transfer_to"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/transfer_to_another_call" />
-
- <ListView
- android:id="@+id/concurrent_calls"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:focusable="true"
- android:focusableInTouchMode="true" />
-
- <TextView
- android:id="@+id/empty_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/transfer_no_other_call"
- android:gravity="center" />
-
- <TextView
- android:id="@+id/lbl_your_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/transfer_type_number" />
-
- <AutoCompleteTextView
- android:id="@+id/external_number"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:imeOptions="actionDone"
- android:inputType="text" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
index 3dcfd7fdd59362e260e8bae9ba1c4adea6bfbe9a..eb317889eb0fe222a54549fea093b18dc3bb10b3 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
@@ -1,14 +1,12 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_primary_light"
tools:context=".client.AccountWizard">
<LinearLayout
- android:id="@+id/ring_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -36,7 +34,6 @@
android:textColor="@color/text_color_primary_dark"/>
<TextView
- android:id="@+id/ring_acc_descr_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
index cff75c0d68b4cd7f773de9df8025546cc47cc00c..2ab8ef088c41afacadae46a8f7624d4d86e1e760 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
@@ -2,7 +2,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/activity_account_creation"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/Wizard"
@@ -21,7 +20,6 @@
app:bounded_width="500dp">
<LinearLayout
- android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
@@ -78,7 +76,6 @@
</LinearLayout>
<TextView
- android:id="@+id/ring_password_help_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
index e0171df411e6626df811950676c0532e9e8f69cb..53ebf9550f52629a12eee19fa5d899ec7ad25d89 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
@@ -2,7 +2,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/activity_account_login"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/Wizard">
@@ -78,7 +77,6 @@
android:textSize="14sp" />
<android.support.design.widget.TextInputLayout
- android:id="@+id/ring_add_pin_txt_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml b/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
index 934662e5614371498cba6ebb4badfefd773c543c..97b4c24218cfbcc2f4b0eea39d697ce8e446ff96 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
@@ -22,7 +22,6 @@ along with this program; if not, write to the Free Software
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/Wizard"
@@ -37,7 +36,6 @@ along with this program; if not, write to the Free Software
app:bounded_width="500dp">
<LinearLayout
- android:id="@+id/sipLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -109,7 +107,6 @@ along with this program; if not, write to the Free Software
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
- android:id="@+id/etSipPasswordLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:passwordToggleEnabled="true">
diff --git a/ring-android/app/src/main/res/layout/frag_account_creation.xml b/ring-android/app/src/main/res/layout/frag_account_creation.xml
deleted file mode 100644
index 291cbed8e2ab5d503bbe4bae492064ea5828899e..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/frag_account_creation.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-
-Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/login_form"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#eeeeee"
- tools:context=".client.AccountWizard">
-
- <cx.ring.views.BoundedLinearLayout
- style="@style/AccountFormContainer"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:animateLayoutChanges="false"
- android:descendantFocusability="beforeDescendants"
- android:focusableInTouchMode="true"
- android:orientation="vertical"
- android:padding="0dp"
- app:bounded_width="320dp">
-
- <android.support.v7.widget.CardView
- android:id="@+id/ring_card_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="16dp"
- android:animateLayoutChanges="false">
-
- <RelativeLayout
- android:id="@+id/ring_fields"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:animateLayoutChanges="true"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/imageView6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_margin="16dp"
- android:contentDescription="@string/app_name"
- android:src="@drawable/ring_logo_48dp" />
-
- <TextView
- android:id="@+id/ring_acc_title_txt"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_toLeftOf="@+id/imageView6"
- android:layout_toStartOf="@+id/imageView6"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingTop="24dp"
- android:text="@string/account_wizard_title"
- android:textColor="@color/text_color_primary"
- android:textSize="24sp" />
-
- <TextView
- android:id="@+id/ring_acc_descr_txt"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/ring_acc_title_txt"
- android:paddingBottom="24dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingTop="16dp"
- android:text="@string/help_ring"
- android:textColor="@color/text_color_primary"
- android:textSize="14sp" />
-
- <Button
- android:id="@+id/ring_add_account"
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/ring_acc_descr_txt"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/account_link_button" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@id/ring_add_account"
- android:background="@color/color_primary_light"
- android:orientation="vertical">
-
- <Button
- android:id="@+id/ring_create_btn"
- style="?attr/borderlessButtonStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/account_new_button"
- android:textColor="@color/text_color_primary_dark" />
- </LinearLayout>
-
- </RelativeLayout>
-
- </android.support.v7.widget.CardView>
-
- <android.support.v7.widget.CardView
- android:id="@+id/card_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_margin="16dp"
- android:animateLayoutChanges="false"
- android:clickable="true"
- android:foreground="?android:attr/selectableItemBackground">
-
- <RelativeLayout
- android:id="@+id/sip_fields"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:animateLayoutChanges="true"
- android:nestedScrollingEnabled="false"
- android:orientation="vertical">
-
- <LinearLayout
- android:id="@+id/sipHeaderLinearLayout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/textView3"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingTop="24dp"
- android:singleLine="false"
- android:text="@string/help_sip_title"
- android:textColor="@color/text_color_primary"
- android:textSize="24sp" />
-
- <ImageView
- android:id="@+id/imageView5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
- android:layout_marginTop="16dp"
- android:layout_weight="0"
- android:contentDescription="@string/help_sip_title"
- android:src="@drawable/ic_dialer_sip_black" />
- </LinearLayout>
-
- <TextView
- android:id="@+id/textView4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="24dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingTop="8dp"
- android:singleLine="false"
- android:text="@string/help_sip"
- android:textColor="@color/text_color_primary"
- android:textSize="14sp" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/sipFormLinearLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/sipHeaderLinearLayout"
- android:layout_marginBottom="8dp"
- android:orientation="vertical"
- android:visibility="visible">
-
- <EditText
- android:id="@+id/alias"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:hint="@string/prompt_alias"
- android:singleLine="true" />
-
- <EditText
- android:id="@+id/hostname"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:hint="@string/prompt_hostname"
- android:singleLine="true"
- android:typeface="monospace" />
-
- <EditText
- android:id="@+id/username"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:hint="@string/prompt_username"
- android:singleLine="true"
- android:typeface="monospace" />
-
- <android.support.design.widget.TextInputLayout
- android:id="@+id/etSipPasswordLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:passwordToggleEnabled="true">
-
- <android.support.design.widget.TextInputEditText
- android:id="@+id/password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:hint="@string/prompt_password"
- android:imeActionId="@integer/register_sip_account_actionid"
- android:imeActionLabel="@string/action_create_short"
- android:inputType="textPassword"
- android:singleLine="true"
- android:typeface="monospace" />
- </android.support.design.widget.TextInputLayout>
-
- <Button
- android:id="@+id/create_sip_button"
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:layout_margin="8dp"
- android:gravity="center"
- android:padding="8dp"
- android:text="@string/create_sip_account" />
- </LinearLayout>
-
- </RelativeLayout>
-
- </android.support.v7.widget.CardView>
-
- </cx.ring.views.BoundedLinearLayout>
-
-</ScrollView>
diff --git a/ring-android/app/src/main/res/layout/frag_account_migration.xml b/ring-android/app/src/main/res/layout/frag_account_migration.xml
index 368df978b13aafd1b40da46272fda07b5b911d7f..1df355b4467b8cbfbd7570728785cae119584e98 100644
--- a/ring-android/app/src/main/res/layout/frag_account_migration.xml
+++ b/ring-android/app/src/main/res/layout/frag_account_migration.xml
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:context=".client.AccountWizard">
@@ -36,14 +35,12 @@ along with this program; if not, write to the Free Software
app:bounded_width="320dp">
<android.support.v7.widget.CardView
- android:id="@+id/ring_card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:animateLayoutChanges="false">
<RelativeLayout
- android:id="@+id/ring_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
@@ -99,7 +96,6 @@ along with this program; if not, write to the Free Software
android:orientation="vertical">
<LinearLayout
- android:id="@+id/newAccountLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_primary_light"
diff --git a/ring-android/app/src/main/res/layout/frag_audio_mgmt.xml b/ring-android/app/src/main/res/layout/frag_audio_mgmt.xml
index 8624ef0b7aee43b72e0a0068ab1e7e3e0d08b2af..027bc02147a097d3968dcc4ff36d0186c8937470 100644
--- a/ring-android/app/src/main/res/layout/frag_audio_mgmt.xml
+++ b/ring-android/app/src/main/res/layout/frag_audio_mgmt.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/lv_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
diff --git a/ring-android/app/src/main/res/layout/frag_contact_list.xml b/ring-android/app/src/main/res/layout/frag_contact_list.xml
deleted file mode 100644
index 645915e50c4db98f0d46afe8ae2a990a6a84586c..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/frag_contact_list.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-
-Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- Adrien Beraud <adrien.beraud@savoirfairelinux.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".client.NewConversationActivity">
-
- <se.emilsjolander.stickylistheaders.StickyListHeadersListView
- android:id="@+id/contacts_stickylv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@android:color/white"
- android:clipToPadding="false"
- android:divider="@null"
- android:drawSelectorOnTop="true"
- android:fastScrollEnabled="true"
- android:paddingBottom="8dp"
- android:paddingTop="8dp"
- android:scrollbarStyle="outsideOverlay" />
-
- <TextView
- android:id="@android:id/empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:gravity="center"
- android:text="@string/no_contact_found"
- android:textColor="@color/text_color_primary"
- android:textSize="30sp"
- android:visibility="gone" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_contact_list_header.xml b/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
deleted file mode 100644
index 49bff46ed8f85d7fdb57c72ba6ad1bf021ea70ac..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <include
- android:id="@+id/newcontact_element"
- layout="@layout/item_contact"
- android:layout_width="match_parent"
- android:layout_height="72dp" />
-
- <TextView
- android:id="@+id/fav_head_label"
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:gravity="center_vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:text="@string/starred_contacts_title"
- android:textColor="@color/text_color_secondary"
- android:textSize="16sp"
- android:textStyle="bold" />
-
- <ImageView
- android:id="@+id/imageView3"
- android:layout_width="fill_parent"
- android:layout_height="1dp"
- android:layout_gravity="bottom"
- android:background="#e0e0e0" />
-
- <LinearLayout
- android:id="@+id/llMain"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dp">
-
- <GridView
- android:id="@+id/favorites_grid"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:columnWidth="80dp"
- android:numColumns="auto_fit"
- android:stretchMode="spacingWidth"
- android:verticalSpacing="@dimen/contact_vertical_spacing"
- tools:listitem="@layout/item_contact_starred" />
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_conversation.xml b/ring-android/app/src/main/res/layout/frag_conversation.xml
index a036b0789c7ea8fed7361ca557992115324fd190..f0e66c2bc5ce9b764d6c5c4198d61f9824f16f2b 100644
--- a/ring-android/app/src/main/res/layout/frag_conversation.xml
+++ b/ring-android/app/src/main/res/layout/frag_conversation.xml
@@ -29,7 +29,6 @@
android:background="#e3c1c1">
<TextView
- android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@@ -41,7 +40,6 @@
</RelativeLayout>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
- android:id="@+id/userInputMessageCardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
diff --git a/ring-android/app/src/main/res/layout/frag_device_list.xml b/ring-android/app/src/main/res/layout/frag_device_list.xml
index 4672b3d590a316387bc0d01b9ab575ec40da655f..845e21865689df25b20b54d1a805842de8663657 100644
--- a/ring-android/app/src/main/res/layout/frag_device_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_device_list.xml
@@ -81,7 +81,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:paddingTop="24dp">
<TextView
- android:id="@+id/account_identity_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ring_account_identity"
@@ -112,7 +111,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:orientation="vertical">
<TextView
- android:id="@+id/register_name_help_txt"
style="@style/Subheader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -149,7 +147,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:text="@string/trying_to_register_name" />
<ProgressBar
- android:id="@+id/progressBar"
style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -165,7 +162,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:visibility="gone">
<TextView
- android:id="@+id/registred_name_help_txt"
style="@style/Subheader"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -195,7 +191,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</LinearLayout>
<TextView
- android:id="@+id/headerText"
style="@style/Subheader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -242,7 +237,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</ScrollView>
<include
- android:id="@+id/add_new_device"
layout="@layout/add_new_device_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/ring-android/app/src/main/res/layout/frag_history_detail.xml b/ring-android/app/src/main/res/layout/frag_history_detail.xml
deleted file mode 100644
index a123a0bf0417fbbef36997942df7cd38252fc7ea..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/frag_history_detail.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/frame"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <!-- Background -->
- <RelativeLayout
- android:id="@+id/iv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/header_history_detail"
- android:layout_alignParentTop="true">
-
-
- <ImageView
- android:id="@+id/contact_photo"
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="30dp"/>
-
- <LinearLayout
- android:id="@+id/contact_name_holder"
- android:layout_width="0dp"
- android:layout_height="50dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:background="#AAFFFFFF"
- android:orientation="vertical"
- android:padding="5dp">
-
- <TextView
- android:id="@+id/history_call_name"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:singleLine="true"
- android:textSize="18sp"/>
- </LinearLayout>
-
- </RelativeLayout>
-
-
- <!-- Foreground -->
-
- <ListView
- android:id="@+id/lvMain"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:dividerHeight="2dp"
- android:layout_below="@+id/iv"
- android:fillViewport="true"
- android:drawSelectorOnTop="true">
- </ListView>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_navigation.xml b/ring-android/app/src/main/res/layout/frag_navigation.xml
index e1ec742424936b1d8414aeaa323a8841808d8ced..b3f74433406a9ab23bdbd87bf7f77a48cce2fbd4 100644
--- a/ring-android/app/src/main/res/layout/frag_navigation.xml
+++ b/ring-android/app/src/main/res/layout/frag_navigation.xml
@@ -41,7 +41,6 @@
android:layout_centerHorizontal="true" />
<android.support.design.widget.FloatingActionButton
- android:id="@+id/edit_profile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
diff --git a/ring-android/app/src/main/res/layout/header.xml b/ring-android/app/src/main/res/layout/header.xml
deleted file mode 100644
index efacedd945703e6373768d67b000cb205750dd51..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/header.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:clickable="false"
- android:focusable="false"
- android:orientation="vertical"
- android:background="?android:colorBackground">
-
- <TextView
- android:id="@+id/header_letter"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="false"
- android:focusable="false"
- android:textColor="@color/text_color_secondary"
- android:paddingLeft="5dp"
- android:textSize="16sp"
- android:textStyle="bold"
- android:layout_marginLeft="16dp"
- android:text="A"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="16dp"
- android:textAlignment="viewStart" />
-
- <ImageView
- android:layout_width="fill_parent"
- android:layout_height="1dp"
- android:id="@+id/imageView2"
- android:layout_gravity="bottom"
- android:background="#e0e0e0"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_account_pref.xml b/ring-android/app/src/main/res/layout/item_account_pref.xml
index 068f416e22fb932d881277ed3a698493cacab03a..fab60e8e15a4ef6dd91b4d5e277b303b0fff0629 100644
--- a/ring-android/app/src/main/res/layout/item_account_pref.xml
+++ b/ring-android/app/src/main/res/layout/item_account_pref.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="72dp">
diff --git a/ring-android/app/src/main/res/layout/item_codec.xml b/ring-android/app/src/main/res/layout/item_codec.xml
index 85748f0a6b55f3e7141cfdb5b3fc2269185c9286..6aaf363c19588e15b89c6dca09b75bb5589f8c78 100644
--- a/ring-android/app/src/main/res/layout/item_codec.xml
+++ b/ring-android/app/src/main/res/layout/item_codec.xml
@@ -20,7 +20,6 @@ along with this program; if not, write to the Free Software
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/codec_container"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
tools:context=".client.AccountEditionActivity">
diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
index efe4f6852950c8628639327f303348425b8d83d0..56b978f82fa2fdd7656f3ed2edd9a9ad374d1dc3 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -22,7 +22,6 @@ along with this program; if not, write to the Free Software
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/contactview"
android:layout_width="match_parent"
android:layout_height="72dp"
android:descendantFocusability="blocksDescendants"
diff --git a/ring-android/app/src/main/res/layout/item_contact_starred.xml b/ring-android/app/src/main/res/layout/item_contact_starred.xml
deleted file mode 100644
index 6b9e396b9616c378a3c889c4e872796350f23a43..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/item_contact_starred.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:id="@+id/contactview"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/photo"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:layout_centerHorizontal="true"
- android:contentDescription="@string/contact_picture_description"
- android:scaleType="centerCrop"
- android:layout_gravity="center_horizontal" />
-
- <TextView
- android:id="@+id/display_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_below="@+id/photo"
- android:layout_centerHorizontal="true"
- android:gravity="center"
- android:singleLine="true"
- android:textColor="@color/text_color_primary"
- android:textSize="12sp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_device.xml b/ring-android/app/src/main/res/layout/item_device.xml
index 00275167d643a6cce4aaa048ce8732abd015f15a..554bd2cef7df80703dffdd558a28a78d48b6dad4 100644
--- a/ring-android/app/src/main/res/layout/item_device.xml
+++ b/ring-android/app/src/main/res/layout/item_device.xml
@@ -23,7 +23,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
android:padding="16dp">
<ImageView
- android:id="@+id/icon_device"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
diff --git a/ring-android/app/src/main/res/layout/item_history_call.xml b/ring-android/app/src/main/res/layout/item_history_call.xml
deleted file mode 100644
index fe8dbbac59e7efce474b53aed4438dde456d1f58..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/layout/item_history_call.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-
-Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/contactview"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="10dp" >
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:descendantFocusability="blocksDescendants" >
-
- <TextView
- android:id="@+id/history_call_state"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:textStyle="bold"
- android:paddingLeft="@dimen/padding_small"
- android:singleLine="true" />
-
- <TextView
- android:id="@+id/history_call_date_formatted"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_toRightOf="@+id/history_call_state"
- android:paddingLeft="@dimen/padding_small"
- android:singleLine="true" />
-
- <TextView
- android:id="@+id/history_call_hour"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_toRightOf="@+id/history_call_date_formatted"
- android:paddingLeft="@dimen/padding_small"
- android:singleLine="true" />
-
- <TextView
- android:id="@+id/history_call_duration"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/history_call_date_formatted"
- android:layout_toRightOf="@+id/history_call_state"
- android:paddingLeft="@dimen/padding_small"
- android:singleLine="true" />
-
- <Button
- android:id="@+id/history_call_record"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@drawable/item_generic_selector"
- android:paddingLeft="@dimen/padding_small"
- android:text="@string/hist_replay_button"
- android:visibility="gone" />
- </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/menu/newconv_option_menu.xml b/ring-android/app/src/main/res/menu/newconv_option_menu.xml
deleted file mode 100644
index db3237ab10954e619880f4fbbaa6c086d709d049..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/menu/newconv_option_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_contact_search"
- android:title="@string/searchbar_hint"
- android:icon="@drawable/ic_search_white"
- android:showAsAction="collapseActionView|ifRoom"
- android:actionViewClass="android.widget.SearchView" />
-</menu>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 1bf2e9b5db5a437f47f801707cfa80bdb8276449..f821e5d184fb5f6b2e911b928851a61e60d0f5e9 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -12,7 +12,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">الاتصال بالشبكة غير متوفر</string>
<!--AB menus-->
- <string name="ab_account_creation">حساب جديد</string>
<string name="ab_action_chat">رسائل نصية</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -26,8 +25,6 @@
<!--Dialing Fragment-->
<string name="dial_number">أطلب رقم</string>
<!--History Fragment-->
- <string name="hist_replay_button">إعادة</string>
- <string name="hist_replay_button_stop">توقف</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -38,24 +35,16 @@
<item quantity="many">%d مكالمة</item>
<item quantity="other">%d مكالمة</item>
</plurals>
- <string name="home_transfer_complet">نقل مكتمل</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">لا إتصال موجود</string>
- <string name="starred_contacts_title">المفضلة</string>
<string name="searchbar_hint">ادخل اسم أو رقم هاتف</string>
<string name="choose_number">إختار رقم</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">أنقل إلى مكالمة جارية أخرى:</string>
- <string name="transfer_no_other_call">لا مكالمات أخرى قيد الإنتظار</string>
- <string name="transfer_type_number">إكتب الرقم الذي تريد التحويل إليه:</string>
<!--Notifications-->
<string name="notif_incoming_call">مكالمة واردة</string>
<string name="notif_current_call">المكالمات الحالية</string>
<!--Call Fragment-->
<string name="you_txt_prefix">أنت:</string>
- <string name="action_call_attended_transfer">نقل</string>
- <string name="action_call_conference">مؤتمر</string>
<string name="action_call_hangup">أنهي المكالمة</string>
<string name="ongoing_call">مكالمة جارية</string>
<string name="hist_in_call">مكالمة واردة من %1$s</string>
@@ -84,7 +73,6 @@
<!--Contacts-->
<string name="wizard_next">التالي</string>
<!--MenuHeaderView-->
- <string name="unknown">مجهول</string>
<!--Share fragment-->
<string name="generic_error_migration">خطأ</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-ar/strings_call.xml b/ring-android/app/src/main/res/values-ar/strings_call.xml
index 664530a957a3096f01946bfb9b39d4b627947b61..64a8c82b75872cd50867b1fd80a5998b60c5b893 100644
--- a/ring-android/app/src/main/res/values-ar/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_call.xml
@@ -31,5 +31,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_hold">توقف مؤقت</string>
<string name="call_human_state_unhold">استئنف</string>
<string name="call_human_state_over">فوق</string>
- <string name="conference_human_state_hold">توقف مؤقت</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index 89ff74dbc913d9c2a282292b76b1c499114f7408..d47d16b3d1ca462c98e76d002833b8794d1861e2 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -13,7 +13,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Няма връзка с мрежата</string>
<!--AB menus-->
- <string name="ab_account_creation">Нов акаунт</string>
<string name="ab_action_chat">Текстово съобщение</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -27,25 +26,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Наберете номер</string>
<!--History Fragment-->
- <string name="hist_replay_button">Повторение</string>
- <string name="hist_replay_button_stop">Спиране</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d разговор</item>
<item quantity="other">%d разговора</item>
</plurals>
- <string name="home_transfer_complet">Прехвърлянето е завършено</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Няма намерен контакт</string>
- <string name="starred_contacts_title">Любими</string>
<string name="searchbar_hint">Въведете име или тел. номер…</string>
<string name="choose_number">Изберете номер</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Прехвърляне към друг текущ разговор:</string>
- <string name="transfer_no_other_call">Няма други чакащи разговори</string>
- <string name="transfer_type_number">Въведете номер, към който да прехвърлите:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Входящо обаждане от %1$s</string>
<string name="notif_incoming_call">Входящо обаждане</string>
@@ -55,7 +46,6 @@
<string name="notif_current_call">Текущ разговор</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Вие:</string>
- <string name="action_call_conference">Конференция</string>
<string name="action_call_hangup">Затваряне</string>
<string name="ongoing_call">Текущо обаждане</string>
<string name="hist_in_call">Входящо обаждане от %1$s</string>
@@ -76,7 +66,6 @@
<string name="send_message">Изпращане на съобщение</string>
<string name="message_sending">Изпращане на съобщение…</string>
<string name="time_just_now">Току-що</string>
- <string name="permission_read_denied">Не беше позволено на приложението да чете от мястото за съхранение на данни, така че не може да работи правилно. Моля, дайте това право на приложението.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Право за използване на камерата</string>
<string name="permission_dialog_camera_message">Разговорите с видео изискват правото за използване на камерата. Моля, дайте това право на приложението.</string>
@@ -111,7 +100,6 @@
<string name="profile">Моят профил</string>
<string name="open_the_gallery">Отваряне на галерията</string>
<string name="take_a_photo">Снимане</string>
- <string name="unknown">Неизвестно</string>
<!--Share fragment-->
<string name="share_message">Сканирайте този QR-код с вградения скенер на приложението Ring, което иска да се свърже с Вас.</string>
<string name="share_your_account_information">Споделяне на информацията аз връзка с мен</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index 368f032e781c612a1db4fdadcf2cce9be349e7a3..2784e52e2c9e298308796515118268788202f5fc 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -76,15 +76,9 @@
<string name="account_rtp_max_port">Максимален</string>
<string name="account_rtp_min_port">Минимален</string>
<!--restore/backup-->
- <string name="account_restore_message">Въведете парола за дешифриране на файла.</string>
- <string name="account_restore_decryption_password">Парола за дешифриране</string>
<string name="account_new_device_password">Въведете основната парола, за да отключите акаунта</string>
- <string name="restore_dialog_title">Възстановяване</string>
- <string name="restore_backup_wait">Моля, изчакайте…</string>
<string name="error_password_char_count">Най-малко 6 знака</string>
<string name="error_passwords_not_equals">Паролите не съвпадат</string>
- <string name="restore_failed_dialog_title">Неуспешно възстановяване</string>
- <string name="restore_failed_dialog_msg">Възникна грешка</string>
<string name="export_account_wait_title">Моля, изчакайте…</string>
<string name="export_account_wait_message">Публикуване на новата информация за акаунта</string>
<string name="account_export_end_decryption_message">Отключването на акаунта Ви с предоставената парола не беше успешно.</string>
@@ -98,8 +92,6 @@
<string name="ring_account">Акаунт</string>
<string name="account_migration_title_dialog">Пренасяне на акаунта</string>
<string name="account_update_needed">Нужно е обновяване</string>
- <string name="account_creation_file_too_big">Файлът е твърде голям</string>
- <string name="account_cannot_read">Неуспешен прочит на: %1$s</string>
<string name="account_cannot_be_found_title">Акаунтът не може да бъде открит</string>
<string name="account_cannot_be_found_message">Акаунтът не може да бъде открит в мрежата на Ring.\nУверете се, че е бил изнесен от Ring чрез съществуващо устройство, както и че данните за идентификация са правилни</string>
<string name="account_no_network_title">Неуспешна връзка с мрежата</string>
@@ -109,9 +101,7 @@
<string name="account_device_updated_title">Акаунтът на устройството е обновен</string>
<string name="account_device_updated_message">Вие обновихте акаунта си успешно.</string>
<string name="account_link_button">Свързване на това устройство с акаунт</string>
- <string name="account_import_title">Свързване с съществуващ акаунт</string>
<string name="account_link_prompt_pin">Въведете ПИН</string>
- <string name="account_wizard_title">Добре дошли в</string>
<string name="account_new_button">Създаване на акаунт за Ring</string>
<string name="account_link_export_button">Свързване на друго устройство с този акаунт</string>
<string name="account_link_export_info">За да използвате този акаунт на други устройства, трябва първо да го направите видим в Ring. Това ще създаде ПИН код , който трябва да въведете на новото устройство, за да настроите акаунта. Кодът има давност 10 минути\n\nМоля, въведете паролата си, за да започнем:</string>
@@ -119,10 +109,6 @@
<string name="account_end_export_button">затваряне</string>
<string name="account_end_export_infos">Вашият ПИН код е:\n\n%%\n\nЗа да завършите процеса, трябва да пуснете Ring на новото устройство. Създайте нов профил чрез „Свързване на това устройство с акаунт“. Кодът има давност 10 минути.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Името не може да бъде регистрирано: грешна парола.</string>
- <string name="register_name_invalid">Името не може да бъде регистрирано: несъществуващо име.</string>
- <string name="register_name_already_taken">Името не може да бъде регистрирано: името е заето.</string>
- <string name="register_name_network_error">Името не може да бъде регистрирано: грешка в мрежата или сървъра.</string>
<string name="error_username_empty">Въведете потребителско име</string>
<string name="no_registered_name_for_account">Няма открито регистрирано име за този акаунт</string>
<string name="register_name">Регистриране на име</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings_call.xml b/ring-android/app/src/main/res/values-bg/strings_call.xml
index 71bd86b41d48bc415f37a7262c2a684711e6292b..90eaa59f2a3a823d82eac0158cd79f61eb63b51b 100644
--- a/ring-android/app/src/main/res/values-bg/strings_call.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_call.xml
@@ -32,5 +32,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_hold">Задържане</string>
<string name="call_human_state_unhold">Подновяване</string>
<string name="call_human_state_over">Край</string>
- <string name="conference_human_state_hold">Задържане</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 04d80819fbc94fab66d8c8b561b1296b28068d03..bae9900e5532ed1046101e7201801b175d07d8df 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -13,7 +13,6 @@
<string name="error_no_network">No hi ha connexió a la xarxa</string>
<string name="error_mobile_network_available_but_disabled">Per favor doneu accés a la xarxa mòbil en la pantalla d\'ajustaments.</string>
<!--AB menus-->
- <string name="ab_account_creation">Nou compte</string>
<string name="ab_action_chat">Missatge de text</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,25 +27,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Marca un número</string>
<!--History Fragment-->
- <string name="hist_replay_button">Repetir</string>
- <string name="hist_replay_button_stop">Para</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversa</item>
<item quantity="other">%d Converses</item>
</plurals>
- <string name="home_transfer_complet">Transferència completada</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Contacte no trobat</string>
- <string name="starred_contacts_title">Favorits</string>
<string name="searchbar_hint">Fiqueu un nom o número de telèfon</string>
<string name="choose_number">Escolliu un número</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transferir a altra trucada actual:</string>
- <string name="transfer_no_other_call">No hi ha altres trucades pendents</string>
- <string name="transfer_type_number">Escriure un número per transferir a:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Trucada entrant de %1$s</string>
<string name="notif_incoming_call">Trucada entrant</string>
@@ -56,8 +47,6 @@
<string name="notif_current_call">Trucada actual</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Tu:</string>
- <string name="action_call_attended_transfer">Transferència Atesa</string>
- <string name="action_call_conference">Conferència</string>
<string name="action_call_hangup">Penjar</string>
<string name="ongoing_call">Trucada en marxa</string>
<string name="hist_in_call">Trucada entrant de %1$s</string>
@@ -79,7 +68,6 @@
<string name="send_message">Enviar el missatge</string>
<string name="message_sending">Enviant missatge</string>
<string name="time_just_now">Ara mateix</string>
- <string name="permission_read_denied">L\'aplicació no té permís per llegir al seu emmagatzematge. Per tant, no pot funcionar. Si us plau, considereu la concessió d\'aquest permís</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permís de la càmera</string>
<string name="permission_dialog_camera_message">Les videotrucades necessiten el permís de la càmera per feuncionar. Si us plau, considereu habilitar-lo.</string>
@@ -117,7 +105,6 @@
<string name="profile">El meu perfil</string>
<string name="open_the_gallery">Obrir la galeria</string>
<string name="take_a_photo">Fer una foto</string>
- <string name="unknown">Desconegut</string>
<!--Share fragment-->
<string name="share_message">Escaneja aquest codi QR amb l\'escàner de l\'aplicació Ring que vulga comunicar-se amb tu.</string>
<string name="share_your_account_information">Compartir la meua informació de contacte</string>
diff --git a/ring-android/app/src/main/res/values-ca/strings_call.xml b/ring-android/app/src/main/res/values-ca/strings_call.xml
index a8ae3f64c81f06d4ef42e34422a6195591d6acef..15b8960803e2ae795e43b14233c7fbec9bf8c9bf 100644
--- a/ring-android/app/src/main/res/values-ca/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_call.xml
@@ -22,5 +22,4 @@ along with this program; if not, write to the Free Software
-->
<resources>
<string name="call_human_state_hold">En espera</string>
- <string name="conference_human_state_hold">En espera</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 99a044c1b493b098b9326f1d95cd04b74be442bf..d11ba924f4b45b8907ab958d5b63dc07d2b49eb4 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">Chybí připojení</string>
<string name="error_mobile_network_available_but_disabled">Povolte prosím v nastavení přístup k mobilním datům</string>
<!--AB menus-->
- <string name="ab_account_creation">Nový účet</string>
<string name="ab_action_chat">Textové zprávy</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,13 +35,10 @@
<string name="menu_item_accounts">Spravovat účty</string>
<string name="menu_item_settings">Nastavení</string>
<string name="menu_item_share">Sdílet můj kontakt</string>
- <string name="menu_item_blacklist">Blokované kontakty</string>
<string name="menu_item_about">O Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Vytočit číslo</string>
<!--History Fragment-->
- <string name="hist_replay_button">Znovu přehrát</string>
- <string name="hist_replay_button_stop">Zastavit</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -50,18 +46,11 @@
<item quantity="few">%d Konverzace</item>
<item quantity="other">%d konverzací</item>
</plurals>
- <string name="home_transfering">Přenáší se %1$s do %2$s</string>
- <string name="home_transfer_complet">Přesměrování hotovo</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nenalezen žádný kontakt</string>
- <string name="starred_contacts_title">Oblíbené</string>
<string name="searchbar_hint">Vložte jméno nebo číslo…</string>
<string name="choose_number">Vyberte číslo</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Přesměrovat na čekající hovor:</string>
- <string name="transfer_no_other_call">Žádné čekající hovory</string>
- <string name="transfer_type_number">Vložte číslo, na něž chcete hovor přesměrovat:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Zmeškaný příchozí hovor</string>
<string name="notif_missed_outgoing_call">Zmeškaný odchozí hovor</string>
@@ -73,8 +62,6 @@
<string name="notif_current_call">Současný hovor</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Vy:</string>
- <string name="action_call_attended_transfer">Přesměrování na čekající hovor</string>
- <string name="action_call_conference">Konference</string>
<string name="action_call_hangup">Zavěsit</string>
<string name="ongoing_call">Probíhající hovor</string>
<string name="hist_in_call">Příchozí hovor %1$s</string>
@@ -97,7 +84,6 @@
<string name="send_message">Odeslat zprávu</string>
<string name="message_sending">Odesílám zprávu…</string>
<string name="time_just_now">Právě teď</string>
- <string name="permission_read_denied">Aplikace nemohla číst z vašeho úložiště, takže nemůže správně fungovat. Prosím zvažte poskytnutí jí tohoto povolení</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Povolení ke kameře</string>
<string name="permission_dialog_camera_message">Video konverzace vyžadují povolení ke kameře. Prosím zvažte jeho povolení.</string>
@@ -139,7 +125,6 @@
<string name="open_the_gallery">Otevřít galerii</string>
<string name="take_a_photo">Pořídit fotku</string>
<string name="profile_name_hint">Zadejte své jméno (volitelné)</string>
- <string name="unknown">Neznámé</string>
<!--Share fragment-->
<string name="share_message">Naskenujte QR kód zabudovaným skenerem aplikace Ring, která s vámi chce komunikovat.</string>
<string name="share_message_no_account">Vyberte, prosím, účet ke sdílení.</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index b56ca51166906d6763284f095c2daf36c8ccbb0e..aac623455481bbe5f4f8410a14a66e065f773c5c 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -104,16 +104,9 @@ Svůj účet můžete upravit později</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Rozsah portů zvukového RTP</string>
<!--restore/backup-->
- <string name="account_restore_account">Obnovit účet</string>
- <string name="account_restore_message">Vložte heslo pro dešifrování souboru.</string>
- <string name="account_restore_decryption_password">Dešifrovací heslo</string>
<string name="account_new_device_password">Pro odemčení účtu zadejte hlavní heslo</string>
- <string name="restore_dialog_title">Obnovuje se</string>
- <string name="restore_backup_wait">Počkejte prosím…</string>
<string name="error_password_char_count">Nejméně 6 znaků</string>
<string name="error_passwords_not_equals">Hesla se neshodují</string>
- <string name="restore_failed_dialog_title">Obnova selhala</string>
- <string name="restore_failed_dialog_msg">Nastala chyba</string>
<string name="export_account_wait_title">Počkejte prosím…</string>
<string name="export_account_wait_message">Zveřejňují se informace o novém účtu</string>
<string name="account_export_end_decryption_message">Zadaným heslem nebylo možné váš účet odemknout.</string>
@@ -133,8 +126,6 @@ Zadejte, prosím, své heslo.</string>
<string name="account_migration_title_dialog">Převod účtu</string>
<string name="account_migration_message_dialog">Vaše účty je potřeba aktualizovat. Chcete jít na obrazovku se správou účtů pro provedení této činnosti?</string>
<string name="account_update_needed">Nutná aktualizace</string>
- <string name="account_creation_file_too_big">Soubor je příliš velký</string>
- <string name="account_cannot_read">Nelze přečíst %1$s</string>
<string name="account_cannot_be_found_title">Nelze nalézt účet</string>
<string name="account_cannot_be_found_message">Na síti Ring nebyl účet nalezen.\nUjistěte se, že byl exportován na Ring z existujícího zařízení a že jsou přihlašovací údaje správné.</string>
<string name="account_sip_cannot_be_registered_message">Můžete pokračovat v postupu vytvoření účtu nebo údaje upravit zde. Úpravy jsou možné i později v nastavení účtu.</string>
@@ -150,9 +141,7 @@ Prověřte, prosím, své heslo.</string>
<string name="account_sip_success_message">Úspěšně jste zaregistroval účet SIP.</string>
<string name="account_sip_register_anyway">Přesto zaregistrovat</string>
<string name="account_link_button">Připojit toto zařízení k účtu</string>
- <string name="account_import_title">Připojit k už existujícímu účtu</string>
<string name="account_link_prompt_pin">Zadejte PIN</string>
- <string name="account_wizard_title">Vítejte v</string>
<string name="account_new_button">Vytvořit účet Ring</string>
<string name="account_link_export_button">Připojit k tomuto účtu další zařízení</string>
<string name="account_link_export_info">Pro použití tohoto účtu na dalších zařízeních jej musíte nejdříve vystavit na Ring. Tím se vygeneruje kód PIN, který musíte zadat na novém zařízení, kde nastavujete účet. PIN zůstává platný 10 minut. \n\nPro začátek prosím poskytněte své heslo:</string>
@@ -160,10 +149,6 @@ Prověřte, prosím, své heslo.</string>
<string name="account_end_export_button">zavřít</string>
<string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nK dokončení tohoto procesu otevřete na novém zařízení Ring. Přihlaste se k účtu pomocí „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Jméno nelze zaregistrovat: chybné heslo k účtu.</string>
- <string name="register_name_invalid">Jméno nelze zaregistrovat: neplatné jméno.</string>
- <string name="register_name_already_taken">Jméno nelze zaregistrovat: jméno je již zabrané.</string>
- <string name="register_name_network_error">Jméno nelze zaregistrovat: chyba sítě nebo serveru.</string>
<string name="error_username_empty">Zadejte uživatelské jméno</string>
<string name="no_registered_name_for_account">Pro tento účet nenalezeno žádné registrované jméno</string>
<string name="register_name">Zaregistrovat jméno</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
index db68fc5bff0118dcbafb540f4fb49fe05eb80690..a42ca966d3a5f96bab2f2ed8316934c8cc1452be 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Hovor skončil</string>
<string name="call_human_state_none">Nic</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Aktivní připojen</string>
- <string name="conference_human_state_active_detached">Aktivní odpojen</string>
- <string name="conference_human_state_active_attached_rec">Aktivní připoji záznam</string>
- <string name="conference_human_state_active_detached_rec">Aktivní odpojil záznam</string>
- <string name="conference_human_state_hold">Pozastavit</string>
- <string name="conference_human_state_hold_rec">Pozastavit nahrávání</string>
- <string name="conference_human_state_default">Nic</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index 7aec4406a40763c0ab03601afc5717f590863f42..99998314e6e05eaf7117fe6a3b9387849174c3a9 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">Ingen netværksforbindelse</string>
<string name="error_mobile_network_available_but_disabled">Venligst tillad adgang til telefon netværk under Indstillinger.</string>
<!--AB menus-->
- <string name="ab_account_creation">Ny konto</string>
<string name="ab_action_chat">Text-besked</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,31 +35,21 @@
<string name="menu_item_accounts">Håndtér konti</string>
<string name="menu_item_settings">Indstillinger</string>
<string name="menu_item_share">Del min kontakt</string>
- <string name="menu_item_blacklist">Blokerede kontakter</string>
<string name="menu_item_about">Om Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Indtast et nummer</string>
<!--History Fragment-->
- <string name="hist_replay_button">Genafspil</string>
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d samtale</item>
<item quantity="other">%d samtaler</item>
</plurals>
- <string name="home_transfering">Overfører %1$s til %2$s</string>
- <string name="home_transfer_complet">Overførsel afsluttet</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Ingen kontakt funder</string>
- <string name="starred_contacts_title">Favoritter</string>
<string name="searchbar_hint">Indtast navn eller telefonnummer...</string>
<string name="choose_number">Vælg et nummer</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Overfør til en anden aktiv samtale:</string>
- <string name="transfer_no_other_call">Ikke andre opkald i kø</string>
- <string name="transfer_type_number">Tast nummer at overføre til:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Ubesvarede indgående opkald</string>
<string name="notif_missed_outgoing_call">Ubesvarede udgående opkald</string>
@@ -72,8 +61,6 @@
<string name="notif_current_call">Nuværende opkald</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Dig:</string>
- <string name="action_call_attended_transfer">Overvåget overførsel</string>
- <string name="action_call_conference">Konference</string>
<string name="action_call_hangup">Læg på</string>
<string name="ongoing_call">Aktivt opkald</string>
<string name="hist_in_call">Indgående opkald af %1$s</string>
@@ -96,7 +83,6 @@
<string name="send_message">Send besked</string>
<string name="message_sending">Sender besked...</string>
<string name="time_just_now">Lige nu</string>
- <string name="permission_read_denied">Mangler tilladelse til at læse fra lageret, og kan dermed ikke fungere ordentligt. Overvej venligst at give denne tilladelse</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamera-tilladelse</string>
<string name="permission_dialog_camera_message">Video-samtaler kræver kamera-tilladelse for at fungere. Overvej venligst at give denne tilladelse.</string>
@@ -138,7 +124,6 @@
<string name="open_the_gallery">Åben galleriet</string>
<string name="take_a_photo">Tag et billede</string>
<string name="profile_name_hint">Indtast dit navn (valgfrit)</string>
- <string name="unknown">Ukendt</string>
<!--Share fragment-->
<string name="share_message">Skan denne QRCode med den indbyggede scanner i Ring-applikationen.</string>
<string name="share_message_no_account">Vælg en konto at dele.</string>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
index 24f282a508f4d1691c8da1895e05e6d244c50a1d..5dc74b309eaf6d34238c27456aaa7dba192fe032 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
@@ -104,16 +104,9 @@ Du kan rette din konto senere</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Portinterval for Lyd-RTP</string>
<!--restore/backup-->
- <string name="account_restore_account">Gendan en konto</string>
- <string name="account_restore_message">Indtast kodeord for at dekryptere filen.</string>
- <string name="account_restore_decryption_password">Dekrypteringskodeord</string>
<string name="account_new_device_password">Indtast primære kodeord for at oplåse konto</string>
- <string name="restore_dialog_title">Genskaber</string>
- <string name="restore_backup_wait">Vent venligt...</string>
<string name="error_password_char_count">Mindst 6 tegn</string>
<string name="error_passwords_not_equals">Kodeord stemmer ikke overens</string>
- <string name="restore_failed_dialog_title">Genskabelse mislykkedes</string>
- <string name="restore_failed_dialog_msg">Der skete en fejl</string>
<string name="export_account_wait_title">Vent venligt...</string>
<string name="export_account_wait_message">Publicierer ny konto-information</string>
<string name="account_export_end_decryption_message">Kunne ikke låse din konto op med brug af det angivne kodeord.</string>
@@ -132,8 +125,6 @@ Du kan rette din konto senere</string>
<string name="account_migration_title_dialog">Konto-migrering</string>
<string name="account_migration_message_dialog">Dine konti kræver at blive opdateret. Vil du gå til Konto-indstillingerne for at foretage denne operation ?</string>
<string name="account_update_needed">Opdatering nødvendig</string>
- <string name="account_creation_file_too_big">Filen er for stor</string>
- <string name="account_cannot_read">Kan ikke læse %1$s</string>
<string name="account_cannot_be_found_title">Kan ikke finde konto</string>
<string name="account_cannot_be_found_message">Kontoen kunne ikke findes på Ring-netværket.\nSikr dig at den er eksporteret fra en eksisterende enhed, og at de angivne bruger-oplysninger er korrekte.</string>
<string name="account_sip_cannot_be_registered_message">Du kan fortsætte med konto-oprettelsen eller redigere informationerne her. Du kan under alle omstændigheder lave ændringer senere under konti-indstillingerne.</string>
@@ -148,9 +139,7 @@ Du kan rette din konto senere</string>
<string name="account_sip_success_message">Din SIP-konto blev registreret korrekt.</string>
<string name="account_sip_register_anyway">Registrer alligevel</string>
<string name="account_link_button">Tilknyt denne enhed til en konto</string>
- <string name="account_import_title">Tilknyt til en eksisterende konto</string>
<string name="account_link_prompt_pin">Indtast PIN-kode</string>
- <string name="account_wizard_title">Velkommen til</string>
<string name="account_new_button">Opret en Ring-konto</string>
<string name="account_link_export_button">Tilknyt en anden enhed til denne konto</string>
<string name="account_link_export_info">For at bruge denne konto på andre enheder, skal du først gøre den tilgængelig for Ring. Dette vil generere en PIN-kode som skal indtastes på den nye enhed for at installere kontoen. Pin-koden er gyldig i 10 minutter. \n\nIndtast dit kodeord for at starte:</string>
@@ -158,10 +147,6 @@ Du kan rette din konto senere</string>
<string name="account_end_export_button">luk</string>
<string name="account_end_export_infos">Din PIN-kode er:\n\n%%\n\nFor at afslutte processen skal du åbne Ring på den nye enhed, og oprette en ny konto med \"Tilknyt denne enhed til en konto\". PIN-koden er gyldig i 10 minutter.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Kan ikke registrere navn: forkert kodeord.</string>
- <string name="register_name_invalid">Kan ikke registrere navn: ugyldigt navn</string>
- <string name="register_name_already_taken">Kan ikke registrere navn: navnet er optaget</string>
- <string name="register_name_network_error">Kan ikke registrere navn: netværk eller server-fejl</string>
<string name="error_username_empty">Indtast et brugernavn</string>
<string name="no_registered_name_for_account">Intet registreret navn fundet for denne konto</string>
<string name="register_name">Registrer navn</string>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_call.xml b/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
index 4f0bdcd444ba829d36aa6ac02e0cb55271a8c7e9..c1a9a3d97626a0f00db90b69019137c93885b607 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Ovre</string>
<string name="call_human_state_none">Ingen</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Aktiv tilføjet</string>
- <string name="conference_human_state_active_detached">Aktiv frakoblet</string>
- <string name="conference_human_state_active_attached_rec">Aktive tilføjet optag</string>
- <string name="conference_human_state_active_detached_rec">Aktiv frakoblet optag</string>
- <string name="conference_human_state_hold">Parkeret</string>
- <string name="conference_human_state_hold_rec">Pause optag</string>
- <string name="conference_human_state_default">Ingen</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 0e86bb2ad77a87b0848172b803c59691c4088890..afc4ece04541d21f284d8a907b1063e96c96d944 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -21,7 +21,6 @@
<string name="error_no_network">Keine Netzwerkkonnektivität</string>
<string name="error_mobile_network_available_but_disabled">Bitte in den Einstellungen Zugriff auf mobile Daten erlauben.</string>
<!--AB menus-->
- <string name="ab_account_creation">Neues Konto</string>
<string name="ab_action_chat">Textnachrichten</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,26 +35,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Nummer wählen</string>
<!--History Fragment-->
- <string name="hist_replay_button">Wiedergeben</string>
- <string name="hist_replay_button_stop">Beenden</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Gespräche</item>
<item quantity="other">%d Gespräche</item>
</plurals>
- <string name="home_transfering">Übertragung von %1$s zu %2$s</string>
- <string name="home_transfer_complet">Übertragung abgeschlossen</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Es wurde kein Kontakt gefunden</string>
- <string name="starred_contacts_title">Favoriten</string>
<string name="searchbar_hint">Namen oder Telefonnummer eingeben</string>
<string name="choose_number">Nummer auswählen</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Durchstellen zu einem anderen aktuellen Anruf:</string>
- <string name="transfer_no_other_call">Keine weiteren Anrufe wartend</string>
- <string name="transfer_type_number">Eingabe Empfänger-Nummer:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Eingehender Anruf von %1$s</string>
<string name="notif_incoming_call">Eingehender Anruf</string>
@@ -65,8 +55,6 @@
<string name="notif_current_call">Aktueller Anruf</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Sie:</string>
- <string name="action_call_attended_transfer">Übergabe nach Ankündigung</string>
- <string name="action_call_conference">Konferenz</string>
<string name="action_call_hangup">Auflegen</string>
<string name="ongoing_call">Aktiver Anruf</string>
<string name="hist_in_call">Eingehender Anruf von %1$s</string>
@@ -89,7 +77,6 @@
<string name="send_message">Nachricht senden</string>
<string name="message_sending">Nachricht senden...</string>
<string name="time_just_now">Gerade eben</string>
- <string name="permission_read_denied">Der Anwendung wurde der lesende Speicherzugriff verwehrt. Daher kann sie nicht ordnungsgemäß funktionieren. Bitte erlauben Sie diesen Zugriff.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
<string name="permission_dialog_camera_message">Video-Konferenzen benötigen Zugriff auf die Kamera. Bitte erlauben Sie diesen Zugriff.</string>
@@ -130,7 +117,6 @@
<string name="open_the_gallery">Galerie öffnen</string>
<string name="take_a_photo">Mache ein Foto</string>
<string name="profile_name_hint">Name eingeben (optional)</string>
- <string name="unknown">Unbekannt</string>
<!--Share fragment-->
<string name="share_message">Scanne diesen QR-Code mit dem Ring-QR-Code-Scanner des neuen Kommunikationspartners.</string>
<string name="share_message_no_account">Bitte wählen Sie ein Konto, das Sie teilen wollen.</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index c95ecf997723238366fba99a189f56efb7200c31..a2cb2933d2f04034643956527eeb3b9046bbb3d7 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -67,11 +67,8 @@
<string name="account_rtp_max_port">Maximum</string>
<string name="account_rtp_min_port">Minimum</string>
<!--restore/backup-->
- <string name="account_restore_decryption_password">Entschlüsselungskennwort</string>
- <string name="restore_backup_wait">Bitte warten...</string>
<string name="error_password_char_count">Mindestens 6 Zeichen</string>
<string name="error_passwords_not_equals">Kennwörter stimmen nicht überein</string>
- <string name="restore_failed_dialog_msg">Fehler aufgetreten</string>
<string name="export_account_wait_title">Bitte warten...</string>
<string name="account_export_end_error_title">Fehler</string>
<string name="account_device_updated_message">Sie haben ihr Ring-Konto erfolgreich aktualisiert.</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
index d7d84aebb310e0e79ac3400406068ffa31e4a708..25e7dbe5730adfc6fb296bc3dbe8df26b75cd3ad 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
@@ -33,7 +33,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_unhold">Gespräch fortsetzen</string>
<string name="call_human_state_over">Vorbei</string>
<string name="call_human_state_none">Keine</string>
- <string name="conference_human_state_hold">In die Warteschleife schalten</string>
- <string name="conference_human_state_hold_rec">Drücken Sie REC</string>
- <string name="conference_human_state_default">Keine</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 57d554d0d8db9fc8eb8ac0e4fb2511021f5d7657..605e3ec865c0c6de6aed6668477c478a7b90bce0 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">Keine Netzwerkverbindung</string>
<string name="error_mobile_network_available_but_disabled">Bitte erlauben Sie den Zugang zum Mobilfunknetz in den Einstellungen</string>
<!--AB menus-->
- <string name="ab_account_creation">Neues Konto</string>
<string name="ab_action_chat">Textnachrichten</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,31 +35,21 @@
<string name="menu_item_accounts">Konten verwalten</string>
<string name="menu_item_settings">Einstellungen</string>
<string name="menu_item_share">Meinen Kontakt teilen</string>
- <string name="menu_item_blacklist">Gesperrte Kontakte</string>
<string name="menu_item_about">Über Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Nummer wählen</string>
<!--History Fragment-->
- <string name="hist_replay_button">Erneut wiedergeben</string>
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Unterhaltung</item>
<item quantity="other">%d Unterhaltungen</item>
</plurals>
- <string name="home_transfering">Übertrage von %1$s zu %2$s</string>
- <string name="home_transfer_complet">Übertragung abgeschlossen</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Kein Kontakt gefunden</string>
- <string name="starred_contacts_title">Favoriten</string>
<string name="searchbar_hint">Namen oder Telefonnummer eingeben...</string>
<string name="choose_number">Nummer auswählen</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Auf einen anderen aktuellen Anruf weiterleiten</string>
- <string name="transfer_no_other_call">Keine anderen Anrufe wartend</string>
- <string name="transfer_type_number">Nummer für Übertragung eingeben:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Verpasster eingehender Anruf</string>
<string name="notif_missed_outgoing_call">Verpasster ausgehender Anruf</string>
@@ -72,8 +61,6 @@
<string name="notif_current_call">Aktueller Anruf</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Du:</string>
- <string name="action_call_attended_transfer">Übergabe nach Ankündigung</string>
- <string name="action_call_conference">Konferenz</string>
<string name="action_call_hangup">Auflegen</string>
<string name="ongoing_call">Derzeitiger Anruf</string>
<string name="hist_in_call">Eingehender Anruf von %1$s</string>
@@ -96,7 +83,6 @@
<string name="send_message">Nachricht senden</string>
<string name="message_sending">Nachricht wird gesendet…</string>
<string name="time_just_now">Gerade eben</string>
- <string name="permission_read_denied">Die Anwendung hat keine Berechtigung den Speicher zu lesen und funktioniert deswegen nicht richtig. Bitte erteilen Sie diese Berechtigung.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamera Berechtigung</string>
<string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte erteilen Sie diese Berechtigung.</string>
@@ -138,7 +124,6 @@
<string name="open_the_gallery">Galerie öffnen</string>
<string name="take_a_photo">Foto machen</string>
<string name="profile_name_hint">Name eingeben (optional)</string>
- <string name="unknown">Unbekannt</string>
<!--Share fragment-->
<string name="share_message">Scannen Sie diesen QR-Code mit dem eingebauten Scanner der Ringanwendung, die mit Ihnen kommunizieren will.</string>
<string name="share_message_no_account">Bitte wählen Sie ein Konto aus.</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index b3e5948cfe82fcbdfd0cc618e66fd1715316a53d..3874c9d12373e013fef3e83c6ffb6b25be7d03d1 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -104,16 +104,9 @@ Sie können ihr Konto später bearbeiten</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Audio RTP Portbereich</string>
<!--restore/backup-->
- <string name="account_restore_account">Konto wiederherstellen</string>
- <string name="account_restore_message">Passwort eingeben um die Datei zu entschlüsseln</string>
- <string name="account_restore_decryption_password">Passwort zum Entschlüsseln</string>
<string name="account_new_device_password">Geben Sie das Hauptpasswort ein, um das Konto zu entsperren</string>
- <string name="restore_dialog_title">Wiederherstellungsvorgang</string>
- <string name="restore_backup_wait">Bitte warten…</string>
<string name="error_password_char_count">Mindestens 6 Zeichen</string>
<string name="error_passwords_not_equals">Die Passwörter stimmen nicht überein</string>
- <string name="restore_failed_dialog_title">Wiederherstellen fehlgeschlagen</string>
- <string name="restore_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
<string name="export_account_wait_title">Bitte warten…</string>
<string name="export_account_wait_message">Neue Konto-Informationen veröffentlichen</string>
<string name="account_export_end_decryption_message">Ihr Konto konnte mit dem angegebenen Passwort nicht entsperrt werden</string>
@@ -132,8 +125,6 @@ Sie können ihr Konto später bearbeiten</string>
<string name="account_migration_title_dialog">Konto-Migration</string>
<string name="account_migration_message_dialog">Ihre Konten müssen aktualisiert werden. Möchten Sie zum Kontoverwaltungsfenster gehen, um diesen Vorgang auszuführen?</string>
<string name="account_update_needed">Aktualisierung durchführen</string>
- <string name="account_creation_file_too_big">Datei ist zu gross</string>
- <string name="account_cannot_read">Kann %1$s nicht lesen</string>
<string name="account_cannot_be_found_title">Kann Konto nicht finden</string>
<string name="account_cannot_be_found_message">Konto kann im Ring-Netzwerk nicht gefunden werden.\nStellen Sie sicher, dass es von einem bereits konfiguierten Gerät exportiert wurde und dass die angegebenen Zugansdaten korrekt sind.</string>
<string name="account_sip_cannot_be_registered_message">Sie können mit dem Kontoerstellungsprozess fortfahren oder Ihre Informationen hier bearbeiten. Änderungen sind später in den Kontoeinstellungen noch möglich.</string>
@@ -148,9 +139,7 @@ Sie können ihr Konto später bearbeiten</string>
<string name="account_sip_success_message">Sie haben erfolgreich Ihr SIP-Konto registriert.</string>
<string name="account_sip_register_anyway">Trotzdem registieren</string>
<string name="account_link_button">Dieses Gerät mit einem Konto verknüpfen</string>
- <string name="account_import_title">Mit einem vorhandenen Konto verknüpfen</string>
<string name="account_link_prompt_pin">PIN eingeben</string>
- <string name="account_wizard_title">Willkommen bei</string>
<string name="account_new_button">Ein Ring-Konto erstellen</string>
<string name="account_link_export_button">Weiteres Gerät mit diesem Konto verknüpfen</string>
<string name="account_link_export_info">Um dieses Konto auf weiteren Geräten zu verwenden, müssen Sie zuerst in den Kontoeinstellungen eine PIN generieren. Diese muss auf dem neuen Gerät eingeben werden, um das Konto zu importieren. Die PIN ist für 10 Minuten gültig. \n\nBitte geben Sie Ihr Passwort ein um zu beginnen:</string>
@@ -158,10 +147,6 @@ Sie können ihr Konto später bearbeiten</string>
<string name="account_end_export_button">Schließen</string>
<string name="account_end_export_infos">Ihre PIN ist:\n\n%%\n\nUm den Prozess abzuschließen, öffnen Sie Ring auf dem neuen Gerät. Erstellen Sie ein Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Name konnte nicht registriert werden: Falches Passwort.</string>
- <string name="register_name_invalid">Name konnte nicht registriert werden: Ungültiger Name.</string>
- <string name="register_name_already_taken">Name konnte nicht registriert werden: Name existiert bereits.</string>
- <string name="register_name_network_error">Name konnte nicht registriert werden: Netzwerk oder Server Fehler.</string>
<string name="error_username_empty">Benutzername eingeben</string>
<string name="no_registered_name_for_account">Es wurde kein registrierter Name für dieses Konto gefunden</string>
<string name="register_name">Name registrieren</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_call.xml b/ring-android/app/src/main/res/values-de/strings_call.xml
index b3f4d5973df110cff8e7ca1f9bbf53645a61485e..0cfffbfc2e1aaea1c7c20df2b432360cbc97b090 100644
--- a/ring-android/app/src/main/res/values-de/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Über</string>
<string name="call_human_state_none">Kein</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Aktiv angefügt</string>
- <string name="conference_human_state_active_detached">Aktiv getrennt</string>
- <string name="conference_human_state_active_attached_rec">Aktiv angefügt aufnehmend</string>
- <string name="conference_human_state_active_detached_rec">Aktiv getrennt aufnehmend</string>
- <string name="conference_human_state_hold">Halten</string>
- <string name="conference_human_state_hold_rec">Aufnehmend halten</string>
- <string name="conference_human_state_default">Kein</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index f4bc5e4a2253ac09e92e3e977f6439c0f6009042..999eeed671e40651c8f94ad0468823e320051fd8 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -14,7 +14,6 @@
<string name="error_no_network">Καμία σύνδεση στο δίκτυο</string>
<string name="error_mobile_network_available_but_disabled">Παρακαλώ δώστε πρόσβαση στο δίκτυο κινητής τηλεφωνίας από τις ρυθμίσεις του κινητού.</string>
<!--AB menus-->
- <string name="ab_account_creation">Νέος Λογαριασμός</string>
<string name="ab_action_chat">Μήνυμα κειμένου</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -29,21 +28,13 @@
<!--Dialing Fragment-->
<string name="dial_number">Κλήση αριθμού</string>
<!--History Fragment-->
- <string name="hist_replay_button">Απάντηση</string>
- <string name="hist_replay_button_stop">Τερματισμός</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
- <string name="home_transfer_complet">Η προώθηση ολοκληρώθηκε</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Δεν βρέθηκαν επαφές</string>
- <string name="starred_contacts_title">Αγαπημένα</string>
<string name="searchbar_hint">Εισάγετε ένα όνομα ή αριθμό τηλεφώνου</string>
<string name="choose_number">Επιλέξτε αριθμό</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Προώθηση σε ενεργή κλήση</string>
- <string name="transfer_no_other_call">Δεν υπάρχουν εκκρεμείς κλήσεις</string>
- <string name="transfer_type_number">Πληκτρολογείστε αριθμό για προώθηση</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Εισερχόμενη κλήση από %1$s</string>
<string name="notif_incoming_call">Εισερχόμενη κλήση</string>
@@ -53,7 +44,6 @@
<string name="notif_current_call">Κλήση σε εξέλιξη</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Εσύ</string>
- <string name="action_call_conference">Συνδιάσκεψη</string>
<string name="action_call_hangup">Κλείσιμο</string>
<string name="ongoing_call">Εξερχόμενη κλήση</string>
<string name="hist_in_call">Εισερχόμενη κλήση από %1$s</string>
@@ -75,7 +65,6 @@
<string name="send_message">Στείλε μήνυμα</string>
<string name="message_sending">Μήνυμα αποστέλλεται...</string>
<string name="time_just_now">Μόλις τώρα</string>
- <string name="permission_read_denied">Η εφαρμογή δεν ήταν σε θέση να διαβάσει τον δίσκο σας. Με αποτέλεσμα να μην δουλεύει σωστά. Σκεφτείτε να δώσετε δικαιώματα στην λειτουργία αυτή</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Άδεια πρόσβασης στην κάμερα</string>
<string name="permission_dialog_camera_message">Οι κλήσεις μέσω βίντεο χρειάζεται την άδεια στην κάμερά για να δουλέψει. Παρακαλώ σκεφτείτε να την ενεργοποιήσετε.</string>
@@ -107,7 +96,6 @@
<!--MenuHeaderView-->
<string name="profile">Το προφίλ μου</string>
<string name="take_a_photo">Λήψη φωτογραφίας</string>
- <string name="unknown">Άγνωστοι</string>
<!--Share fragment-->
<string name="share_your_account_information">Μοίρασε τις πληροφορίες των επαφών μου</string>
<string name="generic_error_migration">Σφάλμα</string>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index e91868cf4be2592880a391ccc37b6c831503482d..f6a7e6df4cae78ab19c1586549b66ce738cd7641 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -40,7 +40,6 @@
<!--restore/backup-->
<string name="account_export_end_error_title">Σφάλμα</string>
<string name="account_device_updated_message">Ο Ring λογαριασμός σας αναβαθμίστηκε επιτυχώς.</string>
- <string name="account_wizard_title">Καλώς ήλθατε στο</string>
<string name="account_new_button">Δημιουργία λογαριασμού Ring</string>
<!--Name registration-->
<string name="invalid_username">Μη έγκυρο όνομα χρήστη</string>
diff --git a/ring-android/app/src/main/res/values-el/strings_call.xml b/ring-android/app/src/main/res/values-el/strings_call.xml
index 011ac15e06fd50ae92fb4c28c8e19b2b5cc65d41..66f75533621134301e21b27191e4b0f02ef2aabd 100644
--- a/ring-android/app/src/main/res/values-el/strings_call.xml
+++ b/ring-android/app/src/main/res/values-el/strings_call.xml
@@ -33,6 +33,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_unhold">Ακύρωση αναμονής</string>
<string name="call_human_state_over">Τέλος</string>
<string name="call_human_state_none">Κανένα</string>
- <string name="conference_human_state_hold">Αναμονή</string>
- <string name="conference_human_state_default">Κανένα</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index 557ea13f4080663d0c84f0a918a54f3bdf87db43..2c597c7de2e36745fdcafc1fee805abd0a924f04 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -9,7 +9,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Sen reta konekto</string>
<!--AB menus-->
- <string name="ab_account_creation">Nova konto</string>
<string name="ab_action_chat">Text messaging</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -23,25 +22,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Diski numeron</string>
<!--History Fragment-->
- <string name="hist_replay_button">Reludi</string>
- <string name="hist_replay_button_stop">Stopi</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Konversacio</item>
<item quantity="other">%d Konversacioj</item>
</plurals>
- <string name="home_transfer_complet">Transigo finita</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Neniu kontakto trovita</string>
- <string name="starred_contacts_title">Favorataj</string>
<string name="searchbar_hint">Entajpu nomon aŭ telefonnumeron…</string>
<string name="choose_number">Elektu numeron</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transigu al alian vokon:</string>
- <string name="transfer_no_other_call">Sen aliaj vokoj</string>
- <string name="transfer_type_number">Entajpu numeron por transigi al:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Eniranta voko de %1$s</string>
<string name="notif_incoming_call">Eniranta voko</string>
@@ -51,8 +42,6 @@
<string name="notif_current_call">Aktiva voko</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Vi:</string>
- <string name="action_call_attended_transfer">Attended Transfer</string>
- <string name="action_call_conference">Konferenco</string>
<string name="action_call_hangup">Fini vokon</string>
<string name="ongoing_call">Aktiva voko</string>
<string name="hist_in_call">Eniranta voko de %1$s</string>
@@ -74,7 +63,6 @@
<string name="send_message">Sendi mesaĝon</string>
<string name="message_sending">Sendanta mesaĝon…</string>
<string name="time_just_now">Ĵus</string>
- <string name="permission_read_denied">La aplikaĵo ne permesatis legi vian konservadon. Tial, ĝi ne funkcias ĝuste. Bonvole pripensu permesi ĝin</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permeso je kamerao</string>
<string name="permission_dialog_camera_message">Video-konversacioj bezonas permeson je kamerao por funkcii. Bonvole pripensu permesi ĝin.</string>
@@ -102,7 +90,6 @@
<string name="account_create_title">Krei Ring konton</string>
<string name="wizard_next">Sekva</string>
<!--MenuHeaderView-->
- <string name="unknown">Nekonata</string>
<!--Share fragment-->
<string name="generic_error_migration">Eraro</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index 2d8430bf553984d28197be4656a51e3acc58a294..7d0fae318c130adb37f146bf419fa419ef513817 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -83,16 +83,11 @@
<string name="account_rtp_min_port">Minimumo</string>
<string name="account_rtp_port_range">Intervalo de Aŭdia RTP</string>
<!--restore/backup-->
- <string name="account_restore_message">Entajpu pasvorton por malĉifri la dosieron.</string>
- <string name="account_restore_decryption_password">Malĉifra pasvorto</string>
- <string name="restore_backup_wait">Bonvole atendu…</string>
<string name="error_password_char_count">6 signoj minimume</string>
<string name="error_passwords_not_equals">Pasvortoj ne kongruas</string>
- <string name="restore_failed_dialog_msg">Eraro okazis</string>
<string name="export_account_wait_title">Bonvole atendu…</string>
<string name="account_export_end_network_title">Reta eraro</string>
<string name="account_export_end_error_title">Eraro</string>
- <string name="account_wizard_title">Bonvenu al</string>
<string name="account_new_button">Krei Ring konton</string>
<!--Name registration-->
<string name="username_already_taken">Uzantnomo jam prenita</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings_call.xml b/ring-android/app/src/main/res/values-eo/strings_call.xml
index 204113d202ae1007a14454b4b1a4e880761f3bcf..e818a88d210a3304af7ab2a847f28a77b9902874 100644
--- a/ring-android/app/src/main/res/values-eo/strings_call.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_call.xml
@@ -31,5 +31,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_hold">Deteni</string>
<string name="call_human_state_unhold">Maldeteni</string>
<string name="call_human_state_over">Finita</string>
- <string name="conference_human_state_hold">Deteni</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 0175fd1f27b366dc702a93517c1f18095f8e0f05..e3ddcacf1d9be4a04b3501023ed613698bdcffd1 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -20,7 +20,6 @@
<string name="error_no_network">Sin conexión a la red</string>
<string name="error_mobile_network_available_but_disabled">Permite el acceso a la red móvil en el menú de configuración.</string>
<!--AB menus-->
- <string name="ab_account_creation">Cuenta nueva</string>
<string name="ab_action_chat">Mensaje de texto</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -32,31 +31,21 @@
<string name="menu_item_accounts">Administrar cuentas</string>
<string name="menu_item_settings">Configuración</string>
<string name="menu_item_share">Compartir mi contacto</string>
- <string name="menu_item_blacklist">Contactos bloqueados</string>
<string name="menu_item_about">Acerca de Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Marcar un Número</string>
<!--History Fragment-->
- <string name="hist_replay_button">Repetir</string>
- <string name="hist_replay_button_stop">Parar</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversacion</item>
<item quantity="other">Conversaciones: %d</item>
</plurals>
- <string name="home_transfering">Transfiriendo %1$s a %2$s</string>
- <string name="home_transfer_complet">Transferencia completada</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">No se ha encontrado el contacto</string>
- <string name="starred_contacts_title">Favoritos</string>
<string name="searchbar_hint">Introduce nombre o número de teléfono...</string>
<string name="choose_number">Escoge un número</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transferir a otra llamada en curso:</string>
- <string name="transfer_no_other_call">No hay llamadas pendientes</string>
- <string name="transfer_type_number">Escribe el número al que transferir:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Llamada entrante perdida</string>
<string name="notif_missed_outgoing_call">Llamada saliente perdida</string>
@@ -68,8 +57,6 @@
<string name="notif_current_call">Llamada en curso</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Tú:</string>
- <string name="action_call_attended_transfer">Transferencia atendida</string>
- <string name="action_call_conference">Conferencia</string>
<string name="action_call_hangup">Colgar</string>
<string name="ongoing_call">Llamada en curso</string>
<string name="hist_in_call">Llamada entrante de %1$s</string>
@@ -92,7 +79,6 @@
<string name="send_message">Enviar mensaje</string>
<string name="message_sending">Enviando mensaje...</string>
<string name="time_just_now">En este momento</string>
- <string name="permission_read_denied">La aplicación no puede funcionar correctamente porque no tiene permiso para leer tus archivos. Considera darle los permisos necesarios</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permiso de cámara</string>
<string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren utilizar la cámara. Considera conceder este permiso.</string>
@@ -134,7 +120,6 @@
<string name="open_the_gallery">Abrir la galería</string>
<string name="take_a_photo">Tomar una foto</string>
<string name="profile_name_hint">Escribe tu nombre (opcional)</string>
- <string name="unknown">Desconocido</string>
<!--Share fragment-->
<string name="share_message">Escanea este QRCode con el escáner integrado de la aplicación Ring que desea comunicarse contigo.</string>
<string name="share_message_no_account">Seleccione una cuenta para compartir.</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index 9b952fa9a7b34bdb0aac5a943ef46295167f42d9..308859a39bdaa68912f8f7d28f588a1f09770c1c 100644
--- a/ring-android/app/src/main/res/values-es/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es/strings_account.xml
@@ -103,16 +103,9 @@ Puedes editar tu cuenta luego</string>
<string name="account_rtp_min_port">Mínimo</string>
<string name="account_rtp_port_range">Intervalo de puertos de audio RTP</string>
<!--restore/backup-->
- <string name="account_restore_account">Restaurar una cuenta</string>
- <string name="account_restore_message">Introduce la contraseña para descifrar el archivo.</string>
- <string name="account_restore_decryption_password">Contraseña de descifrado</string>
<string name="account_new_device_password">Ingresa la contraseña principal para desbloquear cuenta</string>
- <string name="restore_dialog_title">Restaurando</string>
- <string name="restore_backup_wait">Por favor, espera...</string>
<string name="error_password_char_count">6 caracteres mínimo</string>
<string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
- <string name="restore_failed_dialog_title">La restauración ha fallado</string>
- <string name="restore_failed_dialog_msg">Ha ocurrido un error</string>
<string name="export_account_wait_title">Por favor, espera...</string>
<string name="export_account_wait_message">Publicando nueva información de la cuenta</string>
<string name="account_export_end_decryption_message">Error al desbloquear tu cuenta con la contraseña provista</string>
@@ -131,8 +124,6 @@ Puedes editar tu cuenta luego</string>
<string name="account_migration_title_dialog">Migración de la cuenta</string>
<string name="account_migration_message_dialog">Debes actualizar tus cuentas. ¿Quieres pasar a la zona de gestión de cuentas para hacerlo ahora?</string>
<string name="account_update_needed">Actualización requerida</string>
- <string name="account_creation_file_too_big">El archivo es demasiado grande</string>
- <string name="account_cannot_read">Error al leer %1$s</string>
<string name="account_cannot_be_found_title">Error al encontrar la cuenta</string>
<string name="account_cannot_be_found_message">La cuenta no ha podido ser encontrada en la red de Ring.\nAsegúrate de que haya sido exportada en Ring desde un dispositivo existente, y que las credenciales provistas son correctas.</string>
<string name="account_sip_cannot_be_registered_message">Puedes continuar con el proceso de alta de la cuenta o modificar tus datos aquí. También se pueden modificar posteriormente en los ajustes de la cuenta.</string>
@@ -146,9 +137,7 @@ Puedes editar tu cuenta luego</string>
<string name="account_sip_success_message">Has registrado tu cuenta SIP correctamente.</string>
<string name="account_sip_register_anyway">Registrar de todos modos</string>
<string name="account_link_button">Conectar este dispositivo a una cuenta</string>
- <string name="account_import_title">Conectarse a una cuenta existente</string>
<string name="account_link_prompt_pin">Ingresa tu PIN</string>
- <string name="account_wizard_title">Bienvenido a</string>
<string name="account_new_button">Crear una cuenta en Ring</string>
<string name="account_link_export_button">Conectar otro dispositivo a esta cuenta</string>
<string name="account_link_export_info">Para utilizar esta cuenta con otros dispositivos, primero debes exponer tu cuenta en Ring. Esto generará un PIN que deberás ingresar en tu nuevo dispositivo para configurar la cuenta. El PIN es válido por 10 minutos.\n\nPor favor provee tu contraseña para comenzar:</string>
@@ -156,10 +145,6 @@ Puedes editar tu cuenta luego</string>
<string name="account_end_export_button">cerrar</string>
<string name="account_end_export_infos">Tu PIN es:\n\n%%\n\nPara completar el proceso, necesitas abrir Ring en el nuevo dispositivo. Crea una nueva cuenta con \"Vincular este dispositivo a una cuenta\". Tu PIN es válido por 10 minutos.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Error al registrar el nombre: la contraseña de la cuenta es incorrecta.</string>
- <string name="register_name_invalid">Error al registrar el nombre: nombre inválido.</string>
- <string name="register_name_already_taken">Error al registrar el nombre: este nombre ya ha sido utilizado.</string>
- <string name="register_name_network_error">Error al registrar el nombre: error de red o servidor.</string>
<string name="error_username_empty">Ingresa un nombre de usuario</string>
<string name="no_registered_name_for_account">No se ha encontrado un nombre registrado con esta cuenta</string>
<string name="register_name">Registrar nombre</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_call.xml b/ring-android/app/src/main/res/values-es/strings_call.xml
index eb729f702f10abe58aabf18e50426676be8501a1..ff10eb19d1760561eb155514b003c792f39d4e1c 100644
--- a/ring-android/app/src/main/res/values-es/strings_call.xml
+++ b/ring-android/app/src/main/res/values-es/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Terminado</string>
<string name="call_human_state_none">Nada</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Conexión activa</string>
- <string name="conference_human_state_active_detached">Conexión activa desconectada</string>
- <string name="conference_human_state_active_attached_rec">Conexión activa grabar</string>
- <string name="conference_human_state_active_detached_rec">Conexión activa desconectada grabar</string>
- <string name="conference_human_state_hold">Espera</string>
- <string name="conference_human_state_hold_rec">Pulsar REC</string>
- <string name="conference_human_state_default">Nada</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index b487643e2f4aef4f63b9ed1f51273d8886ccd391..a7c84df75e12a3b62069cd57b02147487ecaf135 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">بدون اتصال شبکه</string>
<string name="error_mobile_network_available_but_disabled">لطفاً در صفحهٔ تنظمیات به شبکهٔ سلولی دسترسی دهید.</string>
<!--AB menus-->
- <string name="ab_account_creation">حساب جدید</string>
<string name="ab_action_chat">پیام متنی</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,30 +35,20 @@
<string name="menu_item_accounts">مدیریت حسابها</string>
<string name="menu_item_settings">تنظیمات</string>
<string name="menu_item_share">همرسانی اطّلاعات تماس</string>
- <string name="menu_item_blacklist">مخاطبین مسدود شده</string>
<string name="menu_item_about">دربارهٔ رینگ</string>
<!--Dialing Fragment-->
<string name="dial_number">تماس با یک شماره</string>
<!--History Fragment-->
- <string name="hist_replay_button">پاسخ</string>
- <string name="hist_replay_button_stop">پایان</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="other">%d گفتگو</item>
</plurals>
- <string name="home_transfering">جابهجایی %1$s به %2$s</string>
- <string name="home_transfer_complet">ارسال انجام شد</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">مخاطبی پیدا نشد</string>
- <string name="starred_contacts_title">برگزیدهها</string>
<string name="searchbar_hint">نام یا شماره تلفن را وارد کنید...</string>
<string name="choose_number">شمارهای را برگزینید</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">جابهجایی به دیگر تماس جاری:</string>
- <string name="transfer_no_other_call">هیچ تماس دیگری معلّق نیست</string>
- <string name="transfer_type_number">شمارهای برای فرستادن وارد کنید:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">تماس ورودی از دست رفته</string>
<string name="notif_missed_outgoing_call">تماس خروجی از دست رفته</string>
@@ -71,8 +60,6 @@
<string name="notif_current_call">تماس کنونی</string>
<!--Call Fragment-->
<string name="you_txt_prefix">شما:</string>
- <string name="action_call_attended_transfer">جابهجایی توجّه شده</string>
- <string name="action_call_conference">نشست</string>
<string name="action_call_hangup">قطع کردن</string>
<string name="ongoing_call">تماس خروجی</string>
<string name="hist_in_call">تماس دریافتی به مدّت %1$s</string>
@@ -95,7 +82,6 @@
<string name="send_message">ارسال پیام</string>
<string name="message_sending">در حال ارسال پیام…</string>
<string name="time_just_now">هماکنون</string>
- <string name="permission_read_denied">کاره اجازهٔ خواندن از حافظهتان را ندارد، بنابراین نمیتواند درست رفتار کند. لطفاً این دسترسی را اعطا کنید.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">دسترسی دوربین</string>
<string name="permission_dialog_camera_message">گفتوگوی ویدیویی برای کار کردن نیاز به دسترسی دوربین دارد. لطفاً آن را فعّال کنید.</string>
@@ -137,7 +123,6 @@
<string name="open_the_gallery">گشودن جُنگ</string>
<string name="take_a_photo">گرفتن عکس</string>
<string name="profile_name_hint">نامتان را وارد کنید (اختیاری)</string>
- <string name="unknown">ناشناخته</string>
<!--Share fragment-->
<string name="share_message">این رمز QR را با پویشگر تعبیه شده در کارهٔ رینگی که میخواهد با شما گفتوگو کند، بپویید.</string>
<string name="share_message_no_account">لطفاً برای همرسانی، حسابی را برگزینید.</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 19101f3000b8987b88f66e6f96769b9f5ddfff9b..ce05cbbd71281f2eab986105b7c5e80341fd9fe1 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -104,16 +104,9 @@
<string name="account_rtp_min_port">کمینه</string>
<string name="account_rtp_port_range">دامنهٔ درگاه RTP صدا</string>
<!--restore/backup-->
- <string name="account_restore_account">بازگردانی یک حساب</string>
- <string name="account_restore_message">برای رمزگشایی پرونده، گذرواژه را وارد کنید.</string>
- <string name="account_restore_decryption_password">گذرواژهٔ رمزگشایی</string>
<string name="account_new_device_password">برای قفلگشایی حساب، گذرواژهٔ اصلی را وارد کنید</string>
- <string name="restore_dialog_title">در حال بازگردانی</string>
- <string name="restore_backup_wait">لطفاً صبر کنید…</string>
<string name="error_password_char_count">کمینه ۶ نویسه</string>
<string name="error_passwords_not_equals">گذرواژهها همتا نیستند</string>
- <string name="restore_failed_dialog_title">بارگردانی شکست خورد</string>
- <string name="restore_failed_dialog_msg">خطایی رخ داد</string>
<string name="export_account_wait_title">لطفاً صبر کنید…</string>
<string name="export_account_wait_message">در حال انتشار اطّلاعات حساب نو</string>
<string name="account_export_end_decryption_message">نمیتوان قفل حسابتان را با گذواژهٔ فراهم شده گشود.</string>
@@ -132,8 +125,6 @@
<string name="account_migration_title_dialog">مهاجرت حساب</string>
<string name="account_migration_message_dialog">حسابهایتان باید بهروز شوند. میخواهید برای انجام این عمل، به صفحهٔ مدیریت حساب بروید؟</string>
<string name="account_update_needed">نیاز به بهروز رسانی است</string>
- <string name="account_creation_file_too_big">پرونده خیلی بزرگ است</string>
- <string name="account_cannot_read">نمیتوان %1$s را خواند</string>
<string name="account_cannot_be_found_title">نمیتواند حساب را یافت</string>
<string name="account_cannot_be_found_message">حساب نتوانست روی شبکهٔ رینگ پیدا شود.\nمطمئن شوید از یک افزارهٔ موجود، روی رینگ برونریزی شده است و اعتبارنامههای فراهم شده درست هستند.</string>
<string name="account_sip_cannot_be_registered_message">میتوانید فرایند ایجاد حساب را ادامه داده یا در اینجا اطّلاعاتتان را ویرایش کنید. ویرایش همچنان بعداٍ در تنظیمات حساب ممکن است.</string>
@@ -148,9 +139,7 @@
<string name="account_sip_success_message">حساب سیپتان را با موفّقیت ثبت کردید</string>
<string name="account_sip_register_anyway">در هر صورت ثبت نام کن</string>
<string name="account_link_button">پیوند این افزاره به یک حساب</string>
- <string name="account_import_title">پیوند به یک حساب موجود</string>
<string name="account_link_prompt_pin">پین را وارد کنید</string>
- <string name="account_wizard_title">خوش آمدید به</string>
<string name="account_new_button">ساخت یک حساب رینگ</string>
<string name="account_link_export_button">پیوند افزارهای دیگر به این حساب</string>
<string name="account_link_export_info">برای استفاده از این حساب روی افزارههای دیگر، باید نخست آن را روی رینگ آشکار کنید. این کار یک رمز پین تولید خواهد کرد که باید برای برپایی حساب، روی افزارهٔ نو وارد کنید. پین تا ۱۰ دقیقه معتبر است. \n\nلطفاً برای شروع، گذرواژهتان را وارد کنید.</string>
@@ -158,10 +147,6 @@
<string name="account_end_export_button">بستن</string>
<string name="account_end_export_infos">پین شما:\n\n%%\n\nبرای کامل کردن فرایند، باید رینگ را روی افزارهٔ نو گشوده و حساب جدیدی را با انتخاب «پیوند این افزاره به یک حساب» ایجاد کنید. پینتان برای ۱۰ دقیقه معتبر است.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">نمیتواند نام را ثبت کرد: گذرواژهٔ حساب اشتباه</string>
- <string name="register_name_invalid">نمیتواند نام را ثبت کرد: نام نامعتبر</string>
- <string name="register_name_already_taken">نمیتواند نام را ثبت کرد: نام فبلاً برداشته شده</string>
- <string name="register_name_network_error">نمیتواند نام را ثبت کرد: خطای شبکه یا کارساز</string>
<string name="error_username_empty">یک نام کاربری وارد کنید</string>
<string name="no_registered_name_for_account">هیچ نام ثبتشدهای برای این حساب پیدا نشد</string>
<string name="register_name">ثبت نام</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
index 1606879852ca31bfe4aa9b6d622bde0da40230f7..aac09d970f06c139743edf8104c20784e31c3e48 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
@@ -32,8 +32,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_unhold">در حال انتظار</string>
<string name="call_human_state_none">هیچکدام</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">اتصال برقرار شد</string>
- <string name="conference_human_state_active_detached">اتصال قطع شد</string>
- <string name="conference_human_state_hold">نگه داشتن</string>
- <string name="conference_human_state_default">هیچکدام</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index ab791a2ff4b2f43b699dd8c394c54be2a5951a8a..58e013df07cc30217855097985a739c479ee4c7f 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -13,7 +13,6 @@
<string name="error_no_network">Ei verkkoyhteyttä</string>
<string name="error_mobile_network_available_but_disabled">Anna lupa muuttaa verkkoasetuksia asetusruudussa</string>
<!--AB menus-->
- <string name="ab_account_creation">Uusi tunnus</string>
<string name="ab_action_chat">Tekstiviestittely</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -27,25 +26,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Valitse numero</string>
<!--History Fragment-->
- <string name="hist_replay_button">Toista uudelleen</string>
- <string name="hist_replay_button_stop">Lopeta</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d keskustelu</item>
<item quantity="other">%d Keskustelut</item>
</plurals>
- <string name="home_transfer_complet">Lähetys valmis</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Yhteystietoa ei löytynyt</string>
- <string name="starred_contacts_title">Suosikit</string>
<string name="searchbar_hint">Syötä nimi tai puhelinnumero...</string>
<string name="choose_number">Valitse numero</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Vaihda puhelua:</string>
- <string name="transfer_no_other_call">Ei muita odottavia puheluita</string>
- <string name="transfer_type_number">Kirjoita numero lähettääksesi: </string>
<!--Notifications-->
<string name="notif_incoming_call_title">Saapuva puhelu %1$s</string>
<string name="notif_incoming_call">Saapuva puhelu</string>
@@ -55,8 +46,6 @@
<string name="notif_current_call">Puhelu</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Sinä:</string>
- <string name="action_call_attended_transfer">Yritetty siirto</string>
- <string name="action_call_conference">Kokous</string>
<string name="action_call_hangup">Katkaise puhelu</string>
<string name="ongoing_call">Tämänhetkinen puhelu</string>
<string name="hist_in_call">Saapuva puhelu %1$s</string>
@@ -78,7 +67,6 @@
<string name="send_message">Lähetä viesti</string>
<string name="message_sending">Viestiä lähetetään...</string>
<string name="time_just_now">Juuri nyt</string>
- <string name="permission_read_denied">Ohjelmalla ei ole oikeuksia lukea massamuistia. </string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamera oikeudet</string>
<string name="permission_dialog_camera_message">Videopuhelut vaativat toimiakseen kameran käyttöoikeudet.</string>
@@ -106,7 +94,6 @@
<string name="account_create_title">Luo Ring tunnus</string>
<string name="wizard_next">Seuraava</string>
<!--MenuHeaderView-->
- <string name="unknown">Tuntematon</string>
<!--Share fragment-->
<string name="generic_error_migration">Virhe</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index 609ffbb1ca2d0ca139488a9dc203f1f746393429..2d6066d4209506389e52dccf3adcf1b8f0e93380 100644
--- a/ring-android/app/src/main/res/values-fi/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -70,12 +70,8 @@
<string name="account_rtp_min_port">Minimi</string>
<string name="account_rtp_port_range">RTP porttiväli</string>
<!--restore/backup-->
- <string name="account_restore_message">Syötä salasana purkaaksesi tiedoton salauksen.</string>
- <string name="account_restore_decryption_password">Salauksen purku salasana</string>
- <string name="restore_backup_wait">Odota hetki...</string>
<string name="error_password_char_count">Vähintään 6 merkkiä</string>
<string name="error_passwords_not_equals">Salasanat eivät täsmää</string>
- <string name="restore_failed_dialog_msg">Virhe tapahtui</string>
<string name="export_account_wait_title">Odota hetki...</string>
<string name="account_export_end_error_title">Virhe</string>
<string name="account_new_button">Luo Ring tunnus</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_call.xml b/ring-android/app/src/main/res/values-fi/strings_call.xml
index 68289d3accbf3ccb808cc752a308d51f26fa03a0..59c57a1a43bc28b4bd8e5ee8f7d6f5bbe1ec159b 100644
--- a/ring-android/app/src/main/res/values-fi/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_call.xml
@@ -33,6 +33,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_unhold">Poista pidosta</string>
<string name="call_human_state_over">Loppu</string>
<string name="call_human_state_none">Ei mitään</string>
- <string name="conference_human_state_hold">Pidossa</string>
- <string name="conference_human_state_default">Ei mitään</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index 1c9e5af1d831743517482d65ed77f6ff69adc1a0..ff15310b6d2e1023b2afff1899930111b20050c1 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -21,7 +21,6 @@
<string name="error_no_network">Aucune connectivité réseau</string>
<string name="error_mobile_network_available_but_disabled">Veuillez permettre l\'accès au réseau cellulaire dans l\'écran des réglages.</string>
<!--AB menus-->
- <string name="ab_account_creation">Nouveau compte</string>
<string name="ab_action_chat">Messagerie texte</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,26 +35,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Composer un numéro</string>
<!--History Fragment-->
- <string name="hist_replay_button">Rejouer</string>
- <string name="hist_replay_button_stop">Arrêter</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">Conversations %d</item>
<item quantity="other">Conversations %d</item>
</plurals>
- <string name="home_transfering">Transfert en cours de %1$s à %2$s</string>
- <string name="home_transfer_complet">Transfert complété</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Aucun contact trouvé</string>
- <string name="starred_contacts_title">Favoris</string>
<string name="searchbar_hint">Entrer le nom ou le numéro de téléphone</string>
<string name="choose_number">Choisissez un numéro</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transférer à un autre appel en cours</string>
- <string name="transfer_no_other_call">Aucun appel en attente</string>
- <string name="transfer_type_number">Entrer le numéro pour transférer à:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Appel entrant de %1$s</string>
<string name="notif_incoming_call">Appel entrant</string>
@@ -65,8 +55,6 @@
<string name="notif_current_call">Appel en cours</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Toi</string>
- <string name="action_call_attended_transfer">Transfert en cours</string>
- <string name="action_call_conference">Conférence</string>
<string name="action_call_hangup">Raccrocher</string>
<string name="ongoing_call">Appel en cours</string>
<string name="hist_in_call">Appel entrant de %1$s</string>
@@ -89,7 +77,6 @@
<string name="send_message">Envoyer le message</string>
<string name="message_sending">Transmission du message</string>
<string name="time_just_now">Maintenant</string>
- <string name="permission_read_denied">L\'application n\'a pas les droits de lecture de votre espace de stockage. Il ne peut donc pas fonctionner efficacement. S.v.p. envisager l\'octroi des droits de lecture.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Droits d\'accès à la caméra</string>
<string name="permission_dialog_camera_message">Les conversations vidéos requièrent les droits d\'accès à la caméra pour fonctionner. S.v.p. envisager d\'octroyer ces droits.</string>
@@ -130,7 +117,6 @@
<string name="open_the_gallery">Ouvrir la galerie</string>
<string name="take_a_photo">Prendre un photo.</string>
<string name="profile_name_hint">Entrer votre nom (optionnel)</string>
- <string name="unknown">Inconnu</string>
<!--Share fragment-->
<string name="share_message">Numériser ce code QR à partir du scan intégré de l\'application Ring qui veut communiquer avec vous.</string>
<string name="share_message_no_account">S\'il vous plaît sélectionner un compte à partager.</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
index d530af3c6d5f59f3c086ef377469ba3aefc9c2c7..bab038266c7a46229176dc39e13cdcdacc36030d 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -89,16 +89,9 @@ Vous pouvez modifier votre compte plus tard.</string>
<string name="account_rtp_max_port">Maximum</string>
<string name="account_rtp_min_port">Minimum</string>
<!--restore/backup-->
- <string name="account_restore_account">Réactiver le compte</string>
- <string name="account_restore_message">Entrer le mot de passe pour déchiffrer le fichier.</string>
- <string name="account_restore_decryption_password">Mot de passe de décryptage</string>
<string name="account_new_device_password">Entrer le mot de passe principal pour déverrouiller le compte</string>
- <string name="restore_dialog_title">Réactivation en cours</string>
- <string name="restore_backup_wait">Patienter s\'il vous plaît</string>
<string name="error_password_char_count">Minimum de 6 caractères</string>
<string name="error_passwords_not_equals">Les mots de passe ne concordent pas</string>
- <string name="restore_failed_dialog_title">La réactivation a échouée</string>
- <string name="restore_failed_dialog_msg">Une erreur est survenue</string>
<string name="export_account_wait_title">Patienter s\'il vous plaît</string>
<string name="export_account_wait_message">Publication des informations du nouveau compte</string>
<string name="account_export_end_decryption_message">Votre compte n\'a pu être déverrouillé avec le mot de passe fourni.</string>
@@ -117,8 +110,6 @@ Vous pouvez modifier votre compte plus tard.</string>
<string name="account_migration_title_dialog">Migration du compte</string>
<string name="account_migration_message_dialog">Vos comptes doivent être mis à jour. Désirez-vous vous rendre à la fenêtre de Gestion de compte pour effectuer les modifications?</string>
<string name="account_update_needed">Mise à jour nécessaire</string>
- <string name="account_creation_file_too_big">Fichier trop volumineux</string>
- <string name="account_cannot_read">Lecture impossible de %1$s</string>
<string name="account_cannot_be_found_title">Impossible de trouver le compte</string>
<string name="account_cannot_be_found_message">Impossible de trouver le compte sur le réseau Ring. \nAssurez-vous que le compte ait été exporté sur Ring depuis un appareil existant et d\'avoir fourni les bonnes informations de connexions.</string>
<string name="account_sip_cannot_be_registered_message">Vous pouvez continuer avec le processus de création de compte ou modifier vos informations ici. Vous pouvez effectuer des modifications plus tard dans les paramètres du compte.</string>
@@ -133,9 +124,7 @@ Vous pouvez modifier votre compte plus tard.</string>
<string name="account_sip_success_message">Votre compte Sip a été enregistré avec succès.</string>
<string name="account_sip_register_anyway">S\'inscrire de toute façon</string>
<string name="account_link_button">Associer cet appareil à un compte</string>
- <string name="account_import_title">Associer à un compte existant</string>
<string name="account_link_prompt_pin">Entrer le NIP</string>
- <string name="account_wizard_title">Bienvenue à</string>
<string name="account_new_button">Créer un compte Ring</string>
<string name="account_link_export_button">Associer un autre appareil à ce compte</string>
<string name="account_link_export_info">Pour utiliser ce compte sur d\'autres appareils, vous devez d\'abord l\'afficher sur Ring. Ceci générera un code NIP que vous devez entrer sur le nouvel appareil pour configurer votre compte. Le NIP est valide pour une durée de 10 minutes. \n\nS\'il vous plaît, entrer votre mot de passe pour débuter:</string>
@@ -143,10 +132,6 @@ Vous pouvez modifier votre compte plus tard.</string>
<string name="account_end_export_button">fermer</string>
<string name="account_end_export_infos">Votre NIP est:\n\n%%\n\nPour compléter le processus, vous devez ouvrir Ring sur le nouvel appareil. Créer un nouveau compte avec \"Associer cet appareil à un compte\". Votre NIP est valide pour une durée de 10 minutes.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Impossible d\'enregistrer le nom: le mot de passe est incorrect.</string>
- <string name="register_name_invalid">Impossible d\'enregistrer le nom: nom invalide.</string>
- <string name="register_name_already_taken">Impossible d\'enregistrer le nom: nom indisponible</string>
- <string name="register_name_network_error">Impossible d\'enregistrer le nom: erreur de réseau ou de serveur</string>
<string name="error_username_empty">Entrer le nom d\'utilisateur</string>
<string name="no_registered_name_for_account">Aucun nom enregistré trouvé pour ce compte</string>
<string name="register_name">Nom d\'enregistrement</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml
index a48bcfef1a6af0bcd60f6b87fd47eeca654634c2..736a0deff0ce3b41e9d9dd0ccb7ff561a24e21c9 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">sur</string>
<string name="call_human_state_none">rien</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">active attaché </string>
- <string name="conference_human_state_active_detached">active détaché</string>
- <string name="conference_human_state_active_attached_rec">attachement d\'un enregistrement vidéo </string>
- <string name="conference_human_state_active_detached_rec">déttachement d\'un enregistrement vidéo </string>
- <string name="conference_human_state_hold">tenir</string>
- <string name="conference_human_state_hold_rec">tenir l\'enregistrement </string>
- <string name="conference_human_state_default">rien </string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index 2675568e73f9c8487e668bcd939d18a2d6adc397..d714827fee8e55b70141db1fa1431da10ec6c902 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -13,7 +13,6 @@
<string name="error_no_network">Aucune connexion au réseau n\'est possible</string>
<string name="error_mobile_network_available_but_disabled">Merci d\'accéder au réseau mobile dans les paramètres de l\'écran</string>
<!--AB menus-->
- <string name="ab_account_creation">Nouveau compte</string>
<string name="ab_action_chat">Messages textes</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,25 +27,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Composer un numéro </string>
<!--History Fragment-->
- <string name="hist_replay_button">Répéter</string>
- <string name="hist_replay_button_stop">Arrêter</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversations</item>
<item quantity="other">%d Conversations</item>
</plurals>
- <string name="home_transfer_complet">Le transfert est terminé</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Aucun contact n\'a été trouvé</string>
- <string name="starred_contacts_title">Favoris</string>
<string name="searchbar_hint">Entrer un nom ou un numéro de téléphone</string>
<string name="choose_number">Choisir un numéro de téléphone</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transférer à un autre appel en cours</string>
- <string name="transfer_no_other_call">Aucun appel en attente</string>
- <string name="transfer_type_number">Saisir le numéro de téléphone sur lequel transféré l\'appel</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Appel entrant de %1$s</string>
<string name="notif_incoming_call">Appel entrant</string>
@@ -56,8 +47,6 @@
<string name="notif_current_call">Appel en cours</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Toi</string>
- <string name="action_call_attended_transfer">En attente du transfert d\'appel</string>
- <string name="action_call_conference">Conférence</string>
<string name="action_call_hangup">Raccrocher</string>
<string name="ongoing_call">Appel en cours</string>
<string name="hist_in_call">Appel entrant de %1$s</string>
@@ -79,7 +68,6 @@
<string name="send_message">Envoyer un message</string>
<string name="message_sending">Envoi du message en cours</string>
<string name="time_just_now">maintenant</string>
- <string name="permission_read_denied">Le logiciel n\'a pas les permissions \"en lecture\" pour lire l\'espace de stockage d\'où un problème de fonctionnement. Merci d\'accorder ces permissions.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Autoriser la caméra</string>
<string name="permission_dialog_camera_message">Les conversations en mode vidéo demandent à ce que les permissions soient accordées. Merci d\'activer les permissions.</string>
@@ -118,7 +106,6 @@
<string name="profile">Mon profil</string>
<string name="open_the_gallery">Ouvrir la galerie</string>
<string name="take_a_photo">Prendre une photo</string>
- <string name="unknown">Inconnu</string>
<!--Share fragment-->
<string name="share_message">Scanner le code QR avec le scanner intégré du logiciel Ring pour pouvoir communiquer</string>
<string name="share_message_no_account">Sélectionnez un compte à partager.</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
index b5b16ca9690b8ac3b8db81384e15c5d5c61c6be5..9daa8b6bdc380be44af61de105e4237a5391a13c 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
@@ -24,5 +24,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_hungup">Terminé</string>
<string name="call_human_state_hold">Patienter</string>
<string name="call_human_state_over">Terminé</string>
- <string name="conference_human_state_hold">Patienter</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 7ce5fa7437715480d5849ff825aa9fa14b390030..4eef2a090eecf1bee915fd04121a52ff0f87f817 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -15,7 +15,6 @@
<string name="error_no_network">Pas d\'accès au réseau</string>
<string name="error_mobile_network_available_but_disabled">SVP, autorisez l\'accès au réseau cellulaire dans les options de configuration</string>
<!--AB menus-->
- <string name="ab_account_creation">Nouveau compte</string>
<string name="ab_action_chat">Messagerie texte</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -30,25 +29,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Composez un numéro</string>
<!--History Fragment-->
- <string name="hist_replay_button">Écouter</string>
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversation</item>
<item quantity="other">%d Conversations</item>
</plurals>
- <string name="home_transfer_complet">Transfert terminé</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Aucun contact trouvé</string>
- <string name="starred_contacts_title">Favoris</string>
<string name="searchbar_hint">Taper un nom ou un numéro…</string>
<string name="choose_number">Choisissez un numéro</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transfert avec un autre appel</string>
- <string name="transfer_no_other_call">Aucun appel</string>
- <string name="transfer_type_number">Entrez un numéro</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Appel entrant de %1$s</string>
<string name="notif_incoming_call">Appel entrant</string>
@@ -58,8 +49,6 @@
<string name="notif_current_call">Appel en cours</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Vous :</string>
- <string name="action_call_attended_transfer">Transfert</string>
- <string name="action_call_conference">Conférence</string>
<string name="action_call_hangup">Raccrocher</string>
<string name="ongoing_call">Appel en cours</string>
<string name="hist_in_call">Appel entrant de %1$s</string>
@@ -81,7 +70,6 @@
<string name="send_message">Envoyer le message</string>
<string name="message_sending">Envoi du message</string>
<string name="time_just_now">A l\'instant</string>
- <string name="permission_read_denied">L\'application n\'a pas été autorisée à lire dans la mémoire du dispositif. En conséquence, elle ne peut pas fonctionner correctement. Merci de lui accorder cette permission.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permission d\'accès au caméra</string>
<string name="permission_dialog_camera_message">Les conversation vidéo nécessitent la permission d\'utiliser l\'objectif. Merci de l\'autoriser.</string>
@@ -119,7 +107,6 @@
<string name="profile">Mon profil</string>
<string name="open_the_gallery">Ouvrir la galerie</string>
<string name="take_a_photo">Prendre une photo</string>
- <string name="unknown">Inconnu</string>
<!--Share fragment-->
<string name="share_message">Scannez ce QRCode avec le scanner intégré de l\'application Ring qui souhaite communiquer avec vous.</string>
<string name="share_your_account_information">Partagez mes coordonnées</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index 87a967abf0208d92c1774c94478a74200be60f25..565b691b7f7d1a8b8660cdca155e82f6d91becdf 100644
--- a/ring-android/app/src/main/res/values-fr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_account.xml
@@ -89,16 +89,9 @@ Vous pouvez modifier le compte plus tard.</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Plage de port RTP pour l\'audio</string>
<!--restore/backup-->
- <string name="account_restore_account">Restaurer un compte</string>
- <string name="account_restore_message">Entrer le mot de passe pour déchiffrer le fichier.</string>
- <string name="account_restore_decryption_password">Mot de passe en clair</string>
<string name="account_new_device_password">Entrez le mot de passe principal pour déverrouiller le compte</string>
- <string name="restore_dialog_title">Restauration</string>
- <string name="restore_backup_wait">Veuillez patienter</string>
<string name="error_password_char_count">6 caractères maximales</string>
<string name="error_passwords_not_equals">Mot de passe erronné</string>
- <string name="restore_failed_dialog_title">Échec de la restauration</string>
- <string name="restore_failed_dialog_msg">Une erreur s\'est produite</string>
<string name="export_account_wait_title">Veuillez patienter</string>
<string name="export_account_wait_message">Édition des informations du nouveau compte</string>
<string name="account_export_end_decryption_message">Impossible de déverrouiller votre compte en utilisant le mot de passe fourni.</string>
@@ -112,8 +105,6 @@ Vous pouvez modifier le compte plus tard.</string>
<string name="ring_account">Compte Ring</string>
<string name="account_migration_title_dialog">Migration du compte</string>
<string name="account_update_needed">Mise à jour nécessaire</string>
- <string name="account_creation_file_too_big">Fichier trop gros</string>
- <string name="account_cannot_read">Impossible de lire %1$s</string>
<string name="account_cannot_be_found_title">Compte introuvable</string>
<string name="account_cannot_be_found_message">Le compte n\'a pas pu être trouvé sur le réseau Ring. Veuillez vous assurer qu\'il a été correctement exporté sur Ring depuis un appareil existant et que les identifiants fournis sont corrects.</string>
<string name="account_no_network_title">Impossible de se connecter au réseau</string>
@@ -123,9 +114,7 @@ Vous pouvez modifier le compte plus tard.</string>
<string name="account_device_updated_title">Appareil mis à jour</string>
<string name="account_device_updated_message">Mise à jour de votre compte Ring réalisée avec succès. </string>
<string name="account_link_button">Lier cet appareil à un compte</string>
- <string name="account_import_title">Lier à un compte existant</string>
<string name="account_link_prompt_pin">Entrer votre code PIN</string>
- <string name="account_wizard_title">Bienvenue à </string>
<string name="account_new_button">Créer un compte Ring</string>
<string name="account_link_export_button">Lier un autre appareil à ce compte</string>
<string name="account_link_export_info">Pour utiliser ce compte sur un autre appareil, vous devez d\'abord l\'exposer sur Ring. Ceci générera un code PIN que vous devrez entrer sur le nouvel appareil pour configurer le compte. Le code PIN sera valable pendant 10 minutes. \n\nMerci de commencer par entrer votre mot de passe:</string>
@@ -133,10 +122,6 @@ Vous pouvez modifier le compte plus tard.</string>
<string name="account_end_export_button">fermer</string>
<string name="account_end_export_infos">Votre code Pin est:\n\n%%\n\nPour terminer le processus, vous devez ouvrir Ring sur un autre appareil puis créer un nouveau compte avec \"Lier cet appareil à un compte\". Votre code pin est utilisable pendant 10 minutes.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Impossible d\'enregistrer le nom: mauvais mot de passe.</string>
- <string name="register_name_invalid">impossible d\'enregistrer le nom: nom incorrect.</string>
- <string name="register_name_already_taken">Impossible d\'enregistrer le nom: le nom est déjà utilisé.</string>
- <string name="register_name_network_error">Impossible d\'enregistrer le nom: une erreur s\'est produite sur le réseau ou le serveur.</string>
<string name="error_username_empty">Entrer un nom d\'utilisateur</string>
<string name="no_registered_name_for_account">Aucun nom n\'a été trouvé pour ce compte.</string>
<string name="register_name">Enregistrer un nom</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_call.xml b/ring-android/app/src/main/res/values-fr/strings_call.xml
index bbe240fe11f921e398742be7e41b15d9fe13f350..5e1628088e97bb8803738b419dcf0d2c0728ec4c 100644
--- a/ring-android/app/src/main/res/values-fr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Terminé</string>
<string name="call_human_state_none">Aucun</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Connecté et présent</string>
- <string name="conference_human_state_active_detached">Connecté mais absent</string>
- <string name="conference_human_state_active_attached_rec">Connecté et présent, enregistre</string>
- <string name="conference_human_state_active_detached_rec">Actif mais absent, enregistre</string>
- <string name="conference_human_state_hold">Mettre en attente</string>
- <string name="conference_human_state_hold_rec">Pause d\'enregistrement</string>
- <string name="conference_human_state_default">Aucun</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 480ecd1fbb048c0df8a3d5f66b9cf2fef5aa0514..0b3d5e20f968ff55cf8dfb89a9b29473e8531b24 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -8,7 +8,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">אין חיבוריות רשת</string>
<!--AB menus-->
- <string name="ab_account_creation">חשבון חדש</string>
<!--Left Drawer-->
<!--Accessibility-->
<!--Sections-->
@@ -18,14 +17,9 @@
<string name="menu_item_about">אודות Ring</string>
<!--Dialing Fragment-->
<!--History Fragment-->
- <string name="hist_replay_button">נגן שוב</string>
- <string name="hist_replay_button_stop">עצור</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
- <string name="home_transfer_complet">העברה הושלמה</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">לא נמצא איש קשר</string>
- <string name="starred_contacts_title">מועדפים</string>
<string name="searchbar_hint">הזן שם או מספר טלפון…</string>
<string name="choose_number">בחר מספר</string>
<!--FileExplorerDFragement-->
@@ -34,7 +28,6 @@
<string name="notif_incoming_call">קריאה נכנסת</string>
<!--Call Fragment-->
<string name="you_txt_prefix">את(ה):</string>
- <string name="action_call_conference">ועידה</string>
<string name="action_call_hangup"> נתק</string>
<!--Text messages-->
<string name="send_message">שלח הודעה</string>
diff --git a/ring-android/app/src/main/res/values-he/strings_call.xml b/ring-android/app/src/main/res/values-he/strings_call.xml
index 1cfa4b0725e2e83147815ceaacc7ca34ded69dd4..2237a6de17b32d2aaa22984cc896aecaa4835fbc 100644
--- a/ring-android/app/src/main/res/values-he/strings_call.xml
+++ b/ring-android/app/src/main/res/values-he/strings_call.xml
@@ -22,5 +22,4 @@ along with this program; if not, write to the Free Software
-->
<resources>
<string name="call_human_state_hold">החזק</string>
- <string name="conference_human_state_hold">החזק</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index e6233225cda6c3e78e268bc3c5bec910b303b6be..d5a2dd5b97f6ea5d03f6645a183e2e5dc6f68577 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -19,7 +19,6 @@
<string name="error_no_network">Veza nedostupna</string>
<string name="error_mobile_network_available_but_disabled">Molimo, dozvolite aplikaciji pristup mobilnim podacima u postavkama.</string>
<!--AB menus-->
- <string name="ab_account_creation">Novi račun</string>
<string name="ab_action_chat">Dopisivanje</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,13 +27,10 @@
<string name="menu_item_accounts">Upravljaj računima</string>
<string name="menu_item_settings">Postavke</string>
<string name="menu_item_share">Dijeli moj kontakt</string>
- <string name="menu_item_blacklist">Blokirani kontakti</string>
<string name="menu_item_about">O Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Pozovi broj</string>
<!--History Fragment-->
- <string name="hist_replay_button">Odgovori</string>
- <string name="hist_replay_button_stop">Prekini</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -42,16 +38,11 @@
<item quantity="few">%d razgovora</item>
<item quantity="other">%d razgovora</item>
</plurals>
- <string name="home_transfer_complet">Prijenos dovršen</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nijedan kontakt nije nađen</string>
- <string name="starred_contacts_title">Omiljeni</string>
<string name="searchbar_hint">Unesite ime ili telefonski broj...</string>
<string name="choose_number">Izaberite broj</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Prenesi na drugi razgovor:</string>
- <string name="transfer_no_other_call">Nema dolazećih poziva</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Propušteni dolazni poziv</string>
<string name="notif_missed_outgoing_call">Propušteni odlazni poziv</string>
@@ -63,7 +54,6 @@
<string name="notif_current_call">Trenutni poziv</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Ti:</string>
- <string name="action_call_conference">Konferencija</string>
<string name="action_call_hangup">Poklopi</string>
<string name="ongoing_call">Poziv koji je u tijeku</string>
<string name="hist_in_call">Dolazni poziv od %1$s</string>
@@ -86,7 +76,6 @@
<string name="send_message">Pošalji poruku</string>
<string name="message_sending">Šaljem poruku...</string>
<string name="time_just_now">Upravo sada</string>
- <string name="permission_read_denied">Aplikacija nema dozvolu čitanja podataka. Zato ne može normalno funkcionirati. Molimo dozvolite aplikaciji čitanje podataka.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Dozvola kamere</string>
<string name="permission_dialog_camera_message">Video pozivi zahtjevaju dozvolu korištenja kamere. Molimo dozvolite aplikaciji korištenje kamere.</string>
@@ -124,7 +113,6 @@
<string name="profile_message_warning">Vaš profil je podjeljen samo sa vašim kontaktima</string>
<string name="open_the_gallery">Otvorite galeriju</string>
<string name="take_a_photo">Fotografiraj</string>
- <string name="unknown">Nepoznato</string>
<!--Share fragment-->
<string name="share_message_no_account">Molim odaberite račun za djeljenje</string>
<string name="generic_error_migration">Greška</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index f4fb8b50b409ebf5a69caaa500176fac396e0313..91548913c2ee27a681abf55885a05575ad4c913f 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -78,12 +78,8 @@ Moćete urediti vaš račun kasnije</string>
<string name="account_rtp_max_port">Maksimum</string>
<string name="account_rtp_min_port">Minimum</string>
<!--restore/backup-->
- <string name="account_restore_message">Unesite lozinku za dešifriranje datoteke.</string>
- <string name="account_restore_decryption_password">Lozinka za dešifriranje</string>
- <string name="restore_backup_wait">Molim pričekajte...</string>
<string name="error_password_char_count">6 znakova minimum</string>
<string name="error_passwords_not_equals">Lozinke se ne podudaraju</string>
- <string name="restore_failed_dialog_msg">Došlo je do greške</string>
<string name="export_account_wait_title">Molim pričekajte...</string>
<string name="account_export_end_network_title">Greška mreže</string>
<string name="account_export_end_error_title">Greška</string>
@@ -91,7 +87,6 @@ Moćete urediti vaš račun kasnije</string>
<string name="update_account">Ažuriraj račun</string>
<string name="ring_account">Ring račun</string>
<string name="account_update_needed">Potrebno je ažuriranje</string>
- <string name="account_creation_file_too_big">Datoteka je prevelika</string>
<string name="account_new_button">Napravite Ring račun</string>
<!--Name registration-->
<string name="account_status_connecting">Spajanje</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_call.xml b/ring-android/app/src/main/res/values-hr/strings_call.xml
index b498cadbf4cebdde9207c6ef5e7e781bbc5207a2..fdea8226e05d0d8c106fff4ee1ff00a6e6961da6 100644
--- a/ring-android/app/src/main/res/values-hr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_call.xml
@@ -30,6 +30,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_failure">Neuspjelo</string>
<string name="call_human_state_hold">Na čekanje</string>
<string name="call_human_state_none">Nema</string>
- <string name="conference_human_state_hold">Na čekanje</string>
- <string name="conference_human_state_default">Nema</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index 38380191f4524722087c5c88ed69946b4b8689d6..6d64ff628615e552fe10dbfdc598363f9eb26b85 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -14,7 +14,6 @@
<string name="error_no_network">Nincs hálózati csatlakozás</string>
<string name="error_mobile_network_available_but_disabled">Kérem, engedélyezze a mobilhálózat-elérést a beállítások képernyőn!</string>
<!--AB menus-->
- <string name="ab_account_creation">Új fiók</string>
<string name="ab_action_chat">Szöveges üzenetek</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,25 +27,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Szám tárcsázása</string>
<!--History Fragment-->
- <string name="hist_replay_button">Visszajátszás</string>
- <string name="hist_replay_button_stop">Megállítás</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d beszélgetés</item>
<item quantity="other">%d beszélgetés</item>
</plurals>
- <string name="home_transfer_complet">Átirányítás kész.</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nem találtam partnereket</string>
- <string name="starred_contacts_title">Kedvencek</string>
<string name="searchbar_hint">Név vagy telenfonszám beírása…</string>
<string name="choose_number">Válasszon egy számot</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Átirányítás egy másik jelenlévő hívásra:</string>
- <string name="transfer_no_other_call">Nincs más függő hívás</string>
- <string name="transfer_type_number">Átirányítás a következő számra:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Bejövő hívás a következőtől: %1$s</string>
<string name="notif_incoming_call">Bejövő hívás</string>
@@ -56,7 +47,6 @@
<string name="notif_current_call">Jelenlegi hívás</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Ön:</string>
- <string name="action_call_conference">Konferencia</string>
<string name="action_call_hangup">Lerak</string>
<string name="ongoing_call">Folyamatban lévő hívás </string>
<string name="hist_in_call">Bejövő hívás ennyi ideje: %1$s</string>
@@ -78,7 +68,6 @@
<string name="send_message">Üzenet küldése</string>
<string name="message_sending">Üzenet küldése…</string>
<string name="time_just_now">Éppen most</string>
- <string name="permission_read_denied">Az alkalmazás nem kapott engedélyt a tárhelye olvasásához, így nem képes megfelelően működni. Kérem, fontolja meg ennek az engedélynek a bekapcsolását!</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kameraengedély</string>
<string name="permission_dialog_camera_message">A videóhívások igénylik a kameraengedély jelenlétét. Kérem, fontolja meg ennek az engedélynek a bekapcsolását!</string>
@@ -115,7 +104,6 @@
<string name="profile">Profilom</string>
<string name="open_the_gallery">Galéria megnyitása</string>
<string name="take_a_photo">Fotó készítése</string>
- <string name="unknown">Ismeretlen</string>
<!--Share fragment-->
<string name="share_your_account_information">Elérési adataim megosztása</string>
<string name="generic_error_migration">Hiba</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_call.xml b/ring-android/app/src/main/res/values-hu/strings_call.xml
index 0b6e0cbed742d781841d826dcb0474c82b21ff58..849a3e59511792e0361c32653e8445947a92376b 100644
--- a/ring-android/app/src/main/res/values-hu/strings_call.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_call.xml
@@ -22,5 +22,4 @@ along with this program; if not, write to the Free Software
-->
<resources>
<string name="call_human_state_hold">Tartás</string>
- <string name="conference_human_state_hold">Tartás</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index c7803f79d3e7e28989b07fce77d2cd803e1a26c4..4f52cca7e2b94fc445451a50513c74d6b56d116c 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -46,7 +46,6 @@
<string name="send_message">Kirim pesan</string>
<string name="message_sending">Mengirimkan pesan...</string>
<string name="time_just_now">Baru saja</string>
- <string name="permission_read_denied">Aplikasi ini tidak diizinkan membaca ruang peyimpanan Anda. Sehingga tidak dapat bekerja sebagaimana mestinya.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Izin kamera</string>
<string name="permission_dialog_camera_message">Percakapan video memerlukan izin kamera agar dapat bekerja.</string>
@@ -88,7 +87,6 @@
<string name="open_the_gallery">Buka galeri</string>
<string name="take_a_photo">Ambil foto</string>
<string name="profile_name_hint">Masukkan nama Anda (opsional)</string>
- <string name="unknown">Tidak diketahui</string>
<!--Share fragment-->
<string name="share_message">Pindai QRCode ini menggunakan pemindai yang tersedia pada aplikasi Ring.</string>
<string name="share_message_no_account">Silakan pilih akun untuk dibagikan.</string>
diff --git a/ring-android/app/src/main/res/values-id/strings_call.xml b/ring-android/app/src/main/res/values-id/strings_call.xml
index 5016e07efbf2fc8c094f044f934111a3f6830f62..58f3d1520d03bcac0b86fe85c58a1a5dbe9564e3 100644
--- a/ring-android/app/src/main/res/values-id/strings_call.xml
+++ b/ring-android/app/src/main/res/values-id/strings_call.xml
@@ -24,5 +24,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_current">Bicara</string>
<string name="call_human_state_failure">Gagal</string>
<string name="call_human_state_hold">Tahan</string>
- <string name="conference_human_state_hold">Tahan</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index e451d26690ee81960e17aba382435816d8b6a661..a63bb0c211f52f614cd8b5620f191564666396a7 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -22,7 +22,6 @@
<string name="error_no_network">Assenza di connessione di rete</string>
<string name="error_mobile_network_available_but_disabled">Per favore consenti l\'accesso alla rete mobile dalla schermata delle impostazioni</string>
<!--AB menus-->
- <string name="ab_account_creation">Nuovo account</string>
<string name="ab_action_chat">Messaggiare</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -37,25 +36,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Componi un numero</string>
<!--History Fragment-->
- <string name="hist_replay_button">Replay</string>
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversazione</item>
<item quantity="other">%d Conversazioni</item>
</plurals>
- <string name="home_transfer_complet">Trasferimento completato</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nessun contatto trovato</string>
- <string name="starred_contacts_title">Preferiti</string>
<string name="searchbar_hint">Digita un nome o un numero di telefono</string>
<string name="choose_number">Seleziona un numero</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Trasferisci su un\'altra chiamata:</string>
- <string name="transfer_no_other_call">Nessuna chiamata in attesa</string>
- <string name="transfer_type_number">Digita il numero al quale trasferire:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Chiamata in arrivo da %1$s</string>
<string name="notif_incoming_call">Chiamata in arrivo</string>
@@ -65,8 +56,6 @@
<string name="notif_current_call">Chiamata corrente</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Tu:</string>
- <string name="action_call_attended_transfer">Trasferimenti assistiti</string>
- <string name="action_call_conference">Conferenza</string>
<string name="action_call_hangup">Chiudi</string>
<string name="ongoing_call">Chiamata in corso</string>
<string name="hist_in_call">Chiamata in arrivo di %1$s</string>
@@ -88,7 +77,6 @@
<string name="send_message">Invia messaggio</string>
<string name="message_sending">Sto inviando il messaggio...</string>
<string name="time_just_now">Proprio ora</string>
- <string name="permission_read_denied">La app non può leggere dalla memoria. Quindi non può funzionare correttamente. Se lo desideri, attiva questo permesso.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permesso videocamera</string>
<string name="permission_dialog_camera_message">Le videochiamate hanno bisogna del permesso per accedere alla videocamera. Se lo desideri, attivalo.</string>
@@ -127,7 +115,6 @@
<string name="profile">Il mio profilo</string>
<string name="open_the_gallery">Apri la galleria immagini</string>
<string name="take_a_photo">Scatta una foto</string>
- <string name="unknown">Sconosciuto</string>
<!--Share fragment-->
<string name="share_message">Leggi questo codice QR con lo scanner integrato dell\'applicazione Ring che vuole comunicare con te.</string>
<string name="share_message_no_account">Seleziona un account per la condivisione.</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 8d9f4c2238e381dddc61b584d1786f832bd82274..351391d460d086d61d94ab8cd7221226efb35f05 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -94,16 +94,9 @@ Potrai modificare il tuo account successivamente</string>
<string name="account_rtp_min_port">Minimo</string>
<string name="account_rtp_port_range">Intervallo porte audio RTP</string>
<!--restore/backup-->
- <string name="account_restore_account">Ripristina un account</string>
- <string name="account_restore_message">Inserire la password per decriptare il file.</string>
- <string name="account_restore_decryption_password">Password per decriptare</string>
<string name="account_new_device_password">Inserire la password principale per sbloccare l\'account</string>
- <string name="restore_dialog_title">Ripristino</string>
- <string name="restore_backup_wait">Prego attendere...</string>
<string name="error_password_char_count">Minimo 6 caratteri</string>
<string name="error_passwords_not_equals">Le password non corrispondono</string>
- <string name="restore_failed_dialog_title">Ripristino non riuscito</string>
- <string name="restore_failed_dialog_msg">C\'è stato un errore</string>
<string name="export_account_wait_title">Prego attendere...</string>
<string name="export_account_wait_message">Sto pubblicando le informazioni del nuovo account</string>
<string name="account_export_end_decryption_message">Impossibile sbloccare l\'account x la con la password inserita.</string>
@@ -122,8 +115,6 @@ Potrai modificare il tuo account successivamente</string>
<string name="account_migration_title_dialog">Migrazione account</string>
<string name="account_migration_message_dialog">Il tuo account necessita di essere aggiornato. Vuoi andare alla schermata di gestione dell\'account per completare l\'operazione?</string>
<string name="account_update_needed">Aggiornamento necessario</string>
- <string name="account_creation_file_too_big">Il file è troppo grande</string>
- <string name="account_cannot_read">Impossibile leggere %1$s</string>
<string name="account_cannot_be_found_title">Impossibile trovare l\'account</string>
<string name="account_cannot_be_found_message">Impossibile trovare l\'account nella rete Ring.\nAssicurati di averlo esportato da un account Ring esistente e di aver fornito le credenziali corrette.</string>
<string name="account_sip_cannot_be_registered_message">Puoi continuare con la creazione dell\'account oppure modificare le tue informazioni qui. La modifica sarà comunque possibile più tardi nelle impostazioni dell\'account.</string>
@@ -137,9 +128,7 @@ Potrai modificare il tuo account successivamente</string>
<string name="account_sip_success_message">Hai registrato il tuo account Sip con successo.</string>
<string name="account_sip_register_anyway">Registrati lo stesso</string>
<string name="account_link_button">Collega questo dispositivo ad un account</string>
- <string name="account_import_title">Collega ad un account esistente</string>
<string name="account_link_prompt_pin">Inserisci il PIN</string>
- <string name="account_wizard_title">Benvenuto su</string>
<string name="account_new_button">Crea un account Ring</string>
<string name="account_link_export_button">Collega un altro dispositivo a questo account</string>
<string name="account_link_export_info">Per utilizzare questo account su altri dispositivi, devi prima renderlo visibile su Ring. Questo genererà un codice PIN che dovrai inserire nel nuovo dispositivo per impostare l\'account. Il pin è valido per 10 minuti. \n\nPer favore digita la tua password per cominciare:</string>
@@ -147,10 +136,6 @@ Potrai modificare il tuo account successivamente</string>
<string name="account_end_export_button">chiudi</string>
<string name="account_end_export_infos">Il tuo Pin è:\n\n%%\n\nPer completare la procedura, devi aprire Ring nel nuovo dispositivo. Crea un nuovo account con \"Collega questo dispositivo con un account\". Il tuo pin è valido per 10 minuti.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Non è possibile registrare questo nome: la password dell\'account è errata</string>
- <string name="register_name_invalid">Non è possibile registrare il nome: nome non valido.</string>
- <string name="register_name_already_taken">Non è possibile registrare il nome: nome già registrato.</string>
- <string name="register_name_network_error">Non è possibile registrare il nome: errore di di rete o del server.</string>
<string name="error_username_empty">Inserire un nome utente</string>
<string name="no_registered_name_for_account">Nessun nome registrato è stato trovato per questo account</string>
<string name="register_name">Nome registrazione</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
index aae5bc8bc7fa9926ca878463de7afb4228d11af3..45054c62b27350764d25aa409388c3c24870a09e 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Over</string>
<string name="call_human_state_none">Nessuno</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Collegati</string>
- <string name="conference_human_state_active_detached">Scollegati</string>
- <string name="conference_human_state_active_attached_rec">Collegati con reg.</string>
- <string name="conference_human_state_active_detached_rec">Scollegati con reg.</string>
- <string name="conference_human_state_hold">Pausa</string>
- <string name="conference_human_state_hold_rec">Pausa reg</string>
- <string name="conference_human_state_default">Nessuno</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index e03028a1065180c2c9c439a76b9f7839036de755..1951d353f67a31b781524f3865448ee43aa081b2 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -13,7 +13,6 @@
<string name="error_no_network">Connessione di rete assente</string>
<string name="error_mobile_network_available_but_disabled">Consenti l\'acceso alla rete cellulare dalla schermata impostazioni</string>
<!--AB menus-->
- <string name="ab_account_creation">Nuovo profilo</string>
<string name="ab_action_chat">Messaggio di testo</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,25 +27,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Chiama un numero</string>
<!--History Fragment-->
- <string name="hist_replay_button">Ripeti</string>
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversazione</item>
<item quantity="other">%d Conversazione</item>
</plurals>
- <string name="home_transfer_complet">Trasferimento completato</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nessun contatto trovato</string>
- <string name="starred_contacts_title">Preferiti</string>
<string name="searchbar_hint">Digita nome o numero telefonico</string>
<string name="choose_number">Scegli un numero</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Trasferisci a altri la chiamata corrente</string>
- <string name="transfer_no_other_call">Nessuna chiamata in corso</string>
- <string name="transfer_type_number">Digita il numero a cui traferire</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Chiamata in arrivo da %1$s</string>
<string name="notif_incoming_call">Chiamata in arrivo</string>
@@ -56,8 +47,6 @@
<string name="notif_current_call">Chiamata attiva</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Tu</string>
- <string name="action_call_attended_transfer">Rispondere alla chiamata</string>
- <string name="action_call_conference">Conferenza</string>
<string name="action_call_hangup">Riattacca</string>
<string name="ongoing_call">Chiamata in corso</string>
<string name="hist_in_call">Chiamata in arrivo di %1$s</string>
@@ -79,7 +68,6 @@
<string name="send_message">Invia messaggio</string>
<string name="message_sending">Invio messaggio in corso...</string>
<string name="time_just_now">Immediatamente</string>
- <string name="permission_read_denied">L\'app non ha permessi di lettura della tua memoria. Non può funzionare correttamente. Concedile il permesso</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Attivare videocamera</string>
<string name="permission_dialog_camera_message">La videochiamata richiede l\'attivazione della videocamera. Concedi il permesso.</string>
@@ -117,7 +105,6 @@
<string name="profile">Il mio profilo</string>
<string name="open_the_gallery">Apri la galleria</string>
<string name="take_a_photo">Scatta una foto</string>
- <string name="unknown">Sconosciuto</string>
<!--Share fragment-->
<string name="share_message">Scansiona questo QRCode con il scanner integrato nell\'applicazione Ring che vuole comunicare con te.</string>
<string name="share_your_account_information">Condividi le mie informazioni di contatto</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index f978ed0d63fcc588aaa78519a339b5eb06b49715..42036a9afe924e3208c157bd9347492f5e681fe7 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -84,16 +84,11 @@ Si potra modificare questo account più tardi.</string>
<string name="account_rtp_min_port">Minimo</string>
<string name="account_rtp_port_range">Intervallo porti audio RTP</string>
<!--restore/backup-->
- <string name="account_restore_message">Digitare la password per decifrare il file.</string>
- <string name="account_restore_decryption_password">Password per decifrare</string>
- <string name="restore_backup_wait">Aspettare</string>
<string name="error_password_char_count">6 caratteri minimo</string>
<string name="error_passwords_not_equals">Le password no corrispondono</string>
- <string name="restore_failed_dialog_msg">C\'è stato un errore</string>
<string name="export_account_wait_title">Aspettare</string>
<string name="account_export_end_error_title">Errore</string>
<string name="account_device_updated_message">Hai aggiornato con successo il tuo account Ring.</string>
- <string name="account_wizard_title">Benvenuto a</string>
<string name="account_new_button">Creare un account Ring</string>
<!--Name registration-->
<string name="account_status_connecting">Connessione in corso </string>
diff --git a/ring-android/app/src/main/res/values-it/strings_call.xml b/ring-android/app/src/main/res/values-it/strings_call.xml
index 5aee59d7ccc53aa8d942fd6fb12faa21017b2c9d..4e1edb03566760fb39fae41317abc6f152d930c4 100644
--- a/ring-android/app/src/main/res/values-it/strings_call.xml
+++ b/ring-android/app/src/main/res/values-it/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Finito</string>
<string name="call_human_state_none">Nessuno</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Attivo e presente</string>
- <string name="conference_human_state_active_detached">Attivo ma assente</string>
- <string name="conference_human_state_active_attached_rec">Attivo, presente e registrando</string>
- <string name="conference_human_state_active_detached_rec">Attivo, assente ma registrando</string>
- <string name="conference_human_state_hold">Pausa</string>
- <string name="conference_human_state_hold_rec">Pausa registrazione</string>
- <string name="conference_human_state_default">Nessuno</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index 206fbeab3a854a1c0c05531f508483878f80dc82..f1f12a9f558c2f3b398eb25bb8ccd2a43ae8008e 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">ネットワーク接続がありません</string>
<string name="error_mobile_network_available_but_disabled">設定画面で携帯ネットワークへのアクセスを許可してください。</string>
<!--AB menus-->
- <string name="ab_account_creation">新規アカウント</string>
<string name="ab_action_chat">テキストメッセージ</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,30 +35,20 @@
<string name="menu_item_accounts">アカウント管理</string>
<string name="menu_item_settings">設定</string>
<string name="menu_item_share">連絡先を共有</string>
- <string name="menu_item_blacklist">ブロックした連絡先</string>
<string name="menu_item_about">Ring について</string>
<!--Dialing Fragment-->
<string name="dial_number">電話番号を入力</string>
<!--History Fragment-->
- <string name="hist_replay_button">再生</string>
- <string name="hist_replay_button_stop">停止</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="other">%d 会話</item>
</plurals>
- <string name="home_transfering">%1$s から %2$s へ転送中</string>
- <string name="home_transfer_complet">転送完了</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">連作先が見つかりません</string>
- <string name="starred_contacts_title">お気に入り</string>
<string name="searchbar_hint">相手の名前か電話番号を入力してください...</string>
<string name="choose_number">番号を選んでください</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">現在の通話を別に転送:</string>
- <string name="transfer_no_other_call">他に保留中の通話はありません</string>
- <string name="transfer_type_number">転送先の番号を入力してください:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">不在着信</string>
<string name="notif_missed_outgoing_call">不在発信</string>
@@ -71,8 +60,6 @@
<string name="notif_current_call">現在の通話</string>
<!--Call Fragment-->
<string name="you_txt_prefix">あなた:</string>
- <string name="action_call_attended_transfer">在席転送</string>
- <string name="action_call_conference">グループ通話</string>
<string name="action_call_hangup">通話終了</string>
<string name="ongoing_call">通話中</string>
<string name="hist_in_call">%1$s の着信</string>
@@ -95,7 +82,6 @@
<string name="send_message">メッセージを送信</string>
<string name="message_sending">メッセージを送信中…</string>
<string name="time_just_now">ちょうど今</string>
- <string name="permission_read_denied">アプリはストレージの読み取りが許可されていませんでした。 したがって、正しく機能することができません。 このアクセス許可を付与することを検討してください</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">カメラのアクセス許可</string>
<string name="permission_dialog_camera_message">ビデオ会話ではカメラが動作するためにアクセス許可が必要です。 有効にすることを検討してください。</string>
@@ -137,7 +123,6 @@
<string name="open_the_gallery">ギャラリーを開く</string>
<string name="take_a_photo">写真を撮る</string>
<string name="profile_name_hint">名前を入力してください (オプション)</string>
- <string name="unknown">不明</string>
<!--Share fragment-->
<string name="share_message">あなたと通信したいRingアプリケーションの組み込みスキャナで、このQRコードをスキャンします。</string>
<string name="share_message_no_account">共有するアカウントを選択してください。</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 469e340b2c79f53d43c3f6df0f4d5dc20d6933aa..a12bec1c2d4f012e031254c3ee366b5120f1dd2a 100644
--- a/ring-android/app/src/main/res/values-ja/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -104,16 +104,9 @@
<string name="account_rtp_min_port">最小</string>
<string name="account_rtp_port_range">音声 RTP ポートの範囲</string>
<!--restore/backup-->
- <string name="account_restore_account">アカウントを復元</string>
- <string name="account_restore_message">ファイルを復号するためのパスワードを入力してください。</string>
- <string name="account_restore_decryption_password">復号パスワード</string>
<string name="account_new_device_password">アカウントをロック解除するメインパスワードを入力してください</string>
- <string name="restore_dialog_title">復元中</string>
- <string name="restore_backup_wait">しばらくお待ちください…</string>
<string name="error_password_char_count">6文字以上</string>
<string name="error_passwords_not_equals">パスワードが一致しません</string>
- <string name="restore_failed_dialog_title">復元に失敗しました</string>
- <string name="restore_failed_dialog_msg">エラーが発生しました</string>
<string name="export_account_wait_title">しばらくお待ちください…</string>
<string name="export_account_wait_message">新しいアカウント情報を発行しています</string>
<string name="account_export_end_decryption_message">提供されたパスワードを使用してアカウントをロック解除できませんでした。</string>
@@ -132,8 +125,6 @@
<string name="account_migration_title_dialog">アカウントの移行</string>
<string name="account_migration_message_dialog">アカウントを更新する必要があります。 アカウント管理画面に移動して、この操作を実行しますか？</string>
<string name="account_update_needed">更新が必要です</string>
- <string name="account_creation_file_too_big">ファイルが大きすぎます</string>
- <string name="account_cannot_read">%1$s を読み込みできません</string>
<string name="account_cannot_be_found_title">アカウントが見つかりません</string>
<string name="account_cannot_be_found_message">Ringネットワーク上にアカウントが見つかりませんでした。\n既存のデバイスからRing上にエクスポートされていることと、提供された資格情報が正しいことを確認してください。</string>
<string name="account_sip_cannot_be_registered_message">アカウント作成プロセスを続行するか、ここで情報を編集することができます。 アカウント設定で、後で編集することも可能です。</string>
@@ -148,9 +139,7 @@
<string name="account_sip_success_message">SIPアカウントを正常に登録しました。</string>
<string name="account_sip_register_anyway">とにかく登録する</string>
<string name="account_link_button">このデバイスをアカウントへリンク</string>
- <string name="account_import_title">既存のアカウントにリンク</string>
<string name="account_link_prompt_pin">PINを入力してください</string>
- <string name="account_wizard_title">ようこそ</string>
<string name="account_new_button">Ringアカウントを作成</string>
<string name="account_link_export_button">別のデバイスをこのアカウントへリンク</string>
<string name="account_link_export_info">他のデバイスでこのアカウントを使用するには、まずRing上に公開する必要があります。 これにより、アカウントを設定するために新しいデバイスに入力する必要があるPINコードが生成されます。 PINは10分間有効です。 \n\n開始するには、パスワードを入力してください:</string>
@@ -158,10 +147,6 @@
<string name="account_end_export_button">閉じる</string>
<string name="account_end_export_infos">あなたのPINは:\n\n%%\n\nプロセスを完了するには、新しいデバイスでRingを開く必要があります。 「このデバイスをアカウントにリンク」で、新しいアカウントを作成します。 あなたのPINは10分間有効です。</string>
<!--Name registration-->
- <string name="register_name_wrong_password">名前を登録できません: アカウントのパスワードが間違っています。</string>
- <string name="register_name_invalid">名前を登録できません: 無効な名前です。</string>
- <string name="register_name_already_taken">名前を登録できません: 名前はすでに取得されています。</string>
- <string name="register_name_network_error">名前を登録できません: ネットワークまたはサーバーエラー。</string>
<string name="error_username_empty">ユーザー名を入力してください</string>
<string name="no_registered_name_for_account">このアカウントの登録名が見つかりません</string>
<string name="register_name">登録名</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_call.xml b/ring-android/app/src/main/res/values-ja/strings_call.xml
index 6d9a48f1ebf32868aaabc8fcd4913e30eeffdbdc..95972877588354c42f1bfd5872149d32f7589d61 100644
--- a/ring-android/app/src/main/res/values-ja/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">通話終了</string>
<string name="call_human_state_none">なし</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">アクティブ参加</string>
- <string name="conference_human_state_active_detached">アクティブ退出</string>
- <string name="conference_human_state_active_attached_rec">アクティブ参加 rec</string>
- <string name="conference_human_state_active_detached_rec">アクティブ退出 rec</string>
- <string name="conference_human_state_hold">保留</string>
- <string name="conference_human_state_hold_rec">保留 rec</string>
- <string name="conference_human_state_default">なし</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 782f1c25cb6160fdbb58a9ca25c456b9a7960666..bd9b554ac4b37694f503b3c6a0d10a5703ea9c97 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -18,7 +18,6 @@
<string name="error_no_network">Nėra tinklo ryšio</string>
<string name="error_mobile_network_available_but_disabled">Prašome nustatymų ekrane suteikti prieigą prie korinio tinklo.</string>
<!--AB menus-->
- <string name="ab_account_creation">Nauja paskyra</string>
<string name="ab_action_chat">Tekstinis susirašinėjimas</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -29,11 +28,9 @@
<string name="menu_item_accounts">Tvarkyti paskyras</string>
<string name="menu_item_settings">Nustatymai</string>
<string name="menu_item_share">Bendrinti mano kontaktus</string>
- <string name="menu_item_blacklist">Užblokuoti kontaktai</string>
<string name="menu_item_about">Apie Ring</string>
<!--Dialing Fragment-->
<!--History Fragment-->
- <string name="hist_replay_button_stop">Stabdyti</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -42,7 +39,6 @@
<item quantity="other">%d pokalbių</item>
</plurals>
<!--ContactList Fragment-->
- <string name="no_contact_found">Kontaktų nerasta</string>
<string name="searchbar_hint">Įrašykite vardą ar telefono numerį...</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
@@ -107,7 +103,6 @@
<string name="profile">Mano profilis</string>
<string name="open_the_gallery">Atverti galeriją</string>
<string name="take_a_photo">Padaryti nuotrauką</string>
- <string name="unknown">Nežinomas</string>
<!--Share fragment-->
<string name="share_message">Nuskenuokite šį QR kodą įtaisytu Ring programos, norinčios su jumis susisiekti, skeneriu.</string>
<string name="share_your_account_information">Bendrinti mano kontaktinę informaciją</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index 6e727dbdeee1bb88aa92b38c273c50e64960809c..43c9f282b76fa4ea1c86540699174d5772569924 100644
--- a/ring-android/app/src/main/res/values-lt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_account.xml
@@ -100,16 +100,9 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
<string name="account_rtp_min_port">Mažiausias</string>
<string name="account_rtp_port_range">Garso RTP prievadų rėžis</string>
<!--restore/backup-->
- <string name="account_restore_account">Atkurti paskyrą</string>
- <string name="account_restore_message">Įrašykite slaptažodį, kad iššifruotumėte failą.</string>
- <string name="account_restore_decryption_password">Iššifravimo slaptažodis</string>
<string name="account_new_device_password">Norėdami atrakinti paskyrą, įveskite pagrindinį slaptažodį</string>
- <string name="restore_dialog_title">Atkuriama</string>
- <string name="restore_backup_wait">Prašome palaukti...</string>
<string name="error_password_char_count">Mažiausiai 6 simboliai</string>
<string name="error_passwords_not_equals">Slaptažodžiai nesutampa</string>
- <string name="restore_failed_dialog_title">Atkūrimas nepavyko</string>
- <string name="restore_failed_dialog_msg">Įvyko klaida</string>
<string name="export_account_wait_title">Prašome palaukti...</string>
<string name="export_account_wait_message">Skelbiama naujos paskyros informacija</string>
<string name="account_export_end_decryption_message">Naudojant pateiktą slaptažodį, nepavyko atrakinti jūsų paskyros.</string>
@@ -123,8 +116,6 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
<string name="ring_account_identity">Tapatybė</string>
<string name="account_migration_title_dialog">Paskyros perkėlimas</string>
<string name="account_update_needed">Reikalingas atnaujinimas</string>
- <string name="account_creation_file_too_big">Failas per didelis</string>
- <string name="account_cannot_read">Nepavyksta perskaityti %1$s</string>
<string name="account_cannot_be_found_title">Nepavyksta rasti paskyros</string>
<string name="account_no_network_title">Nepavyksta prisijungti prie tinklo</string>
<string name="account_device_added_title">Paskyros įrenginys pridėtas</string>
@@ -132,14 +123,11 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
<string name="account_device_updated_title">Paskyros įrenginys atnaujintas</string>
<string name="account_device_updated_message">Jūs sėkmingai atnaujinote savo Ring paskyrą.</string>
<string name="account_link_button">Susieti šį įrenginį su paskyra</string>
- <string name="account_import_title">Susieti su esama paskyra</string>
<string name="account_link_prompt_pin">Įveskite PIN</string>
- <string name="account_wizard_title">Sveiki atvykę į </string>
<string name="account_new_button">Sukurti Ring paskyrą</string>
<string name="account_link_export_button">Susieti kitą įrenginį su šia paskyra</string>
<string name="account_end_export_button">užverti</string>
<!--Name registration-->
- <string name="register_name_already_taken">Nepavyksta užregistruoti vardo: vardas jau užimtas.</string>
<string name="no_registered_name_for_account">Šiai paskyrai nerasta jokio registruoto vardo</string>
<string name="registered_username">Registruotas naudotojo vardas</string>
<string name="register_username">Registruoti viešąjį naudotojo vardą (eksperimentinis)</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_call.xml b/ring-android/app/src/main/res/values-lt/strings_call.xml
index 4362d8a9e0432cbd5e8a0687b0fde5972c36a19b..9d21f2bca363097ce0933c4e605d3eae6d1486ee 100644
--- a/ring-android/app/src/main/res/values-lt/strings_call.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_call.xml
@@ -31,5 +31,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_failure">Nepavyko</string>
<string name="call_human_state_hold">Užlaikyta</string>
<string name="call_human_state_over">Baigta</string>
- <string name="conference_human_state_hold">Užlaikyta</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index 0cf75de0c362ced88a05f4fe16beb85c2ee83b6d..b5ef448acf101f6d1f78216b7247da85b3efca3e 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -14,7 +14,6 @@
<string name="error_no_network">Tiada sambungan rangkaian</string>
<string name="error_mobile_network_available_but_disabled">Sila berikan akses kepada rangkaian selular didalam skrin tetapan.</string>
<!--AB menus-->
- <string name="ab_account_creation">Akaun baharu</string>
<string name="ab_action_chat">Pesanan teks</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -29,24 +28,16 @@
<!--Dialing Fragment-->
<string name="dial_number">Dail nombor</string>
<!--History Fragment-->
- <string name="hist_replay_button">Main ulang</string>
- <string name="hist_replay_button_stop">Berhenti</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="other">%d Perbualan</item>
</plurals>
- <string name="home_transfer_complet">Pemindahan berjaya</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Tiada kenalan ditemui</string>
- <string name="starred_contacts_title">Kegemaran</string>
<string name="searchbar_hint">Masukkan nama atau nombor telefon</string>
<string name="choose_number">Pilih nombor</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Pindahkan ke panggilan lain yang sedang berlangsung:</string>
- <string name="transfer_no_other_call">Tiada panggilan lain yang belum selesai</string>
- <string name="transfer_type_number">Taipkan nombor untuk memindahkan:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Panggilan masuk daripada %1$s</string>
<string name="notif_incoming_call">Panggilan masuk</string>
@@ -56,8 +47,6 @@
<string name="notif_current_call">Panggilan sedang berlangsung</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Anda</string>
- <string name="action_call_attended_transfer">Pemindahan panggilan yang disertai</string>
- <string name="action_call_conference">Mesyuarat</string>
<string name="action_call_hangup">Putuskan</string>
<string name="ongoing_call">Panggilan sedang berlangsung</string>
<string name="hist_in_call">Panggilan masuk sebanyak %1$s</string>
@@ -79,7 +68,6 @@
<string name="send_message">Hantar pesan</string>
<string name="message_sending">Sedang menghantar pesan…</string>
<string name="time_just_now">Seketika yang lalu</string>
- <string name="permission_read_denied">Aplikasi ini tidak dibenarkan untuk membaca memori dalaman anda. Oleh begitu, ia tidak dapat bekerja dengan sempurna. Sila pertimbangkan untuk membenarkan akses tersebut</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Akses kamera</string>
<string name="permission_dialog_camera_message">Perbualan video memerlukan akses kepada kamera untuk bekerja dengan sempurna. Sila pertimbangkan untuk membenarkan akses tersebut.</string>
@@ -116,7 +104,6 @@
<string name="profile">Profil saya</string>
<string name="open_the_gallery">Buka galeri</string>
<string name="take_a_photo">Ambil gambar</string>
- <string name="unknown">Tidak diketahui</string>
<!--Share fragment-->
<string name="share_message">Imbas kod QR ini dengan pemgibas terbina dalam dari aplikasi Ring lain yang ingin berkomunikasi dengan anda.</string>
<string name="share_your_account_information">Sila pilih akaun untuk dikongsi</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/ring-android/app/src/main/res/values-ms/strings_account.xml
index 7e06d0771564225bb71e05e30aaaf0dbc3447a8f..44867e1e4b04920803a58949be8e2d63c5da1ab0 100644
--- a/ring-android/app/src/main/res/values-ms/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_account.xml
@@ -89,16 +89,9 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Jarak Port Bunyi RTP</string>
<!--restore/backup-->
- <string name="account_restore_account">Import akaun</string>
- <string name="account_restore_message">Masukkan kata laluan untuk menyahsulitkan fail.</string>
- <string name="account_restore_decryption_password">Kata laluan penyahsulit</string>
<string name="account_new_device_password">Masukkan kata laluan utama untuk menyahsulitkan akaun</string>
- <string name="restore_dialog_title">Mengimport</string>
- <string name="restore_backup_wait">Sila tunggu...</string>
<string name="error_password_char_count">Minimum 6 aksara</string>
<string name="error_passwords_not_equals">Kata laluan tidak sepadan</string>
- <string name="restore_failed_dialog_title">Import gagal</string>
- <string name="restore_failed_dialog_msg">Kegagalan telah terjadi</string>
<string name="export_account_wait_title">Sila tunggu...</string>
<string name="export_account_wait_message">Mengagihkan maklumat akaun baharu</string>
<string name="account_export_end_decryption_message">Tidak dapat menyahsulitkan akaun anda dengan kata laluan yang diberikan.</string>
@@ -112,8 +105,6 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
<string name="ring_account">Akaun Ring</string>
<string name="account_migration_title_dialog">Permindahan akaun</string>
<string name="account_update_needed">Kemaskini diperlukan</string>
- <string name="account_creation_file_too_big">Saiz fail adalah terlalu besar</string>
- <string name="account_cannot_read">Tidak dapt membaca %1$s</string>
<string name="account_cannot_be_found_title">Akaun tidak ditemui</string>
<string name="account_cannot_be_found_message">Akaun tidak ditemui pada rangkaian Ring.\nPastikan anda telah mengeksport akaun Ring daripada perangkat anda yang sedia ada, dan maklumat yang diberikan adalah tepat.</string>
<string name="account_no_network_title">Tidak dapat berhubung dengan rangkaian</string>
@@ -123,7 +114,6 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
<string name="account_device_updated_title">Akaun perangkat telah dikemaskinikan</string>
<string name="account_device_updated_message">Anda telah berjaya mengemaskini akaun Ring anda.</string>
<string name="account_link_button">Sambungkan perangkat ini dengan akaun</string>
- <string name="account_import_title">Sambung dengan akaun yang telah sedia ada</string>
<string name="account_link_prompt_pin">Masukkan PIN</string>
<string name="account_new_button">Cipta akaun Ring</string>
<string name="account_link_export_button">Sambungkan perangkat lain dengan akaun ini</string>
@@ -132,10 +122,6 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
<string name="account_end_export_button">tutup</string>
<string name="account_end_export_infos">PIN anda adalah:\n\n%%\n\nUntuk menyelesaikan proses menyambung, anda mestilah membuka aplikasi Ring pada perangkat baharu. Cipta akaun baharu dengan \\"Sambungkan perangkat ini dengan akaun yang telah sedia ada\\". PIN ini sah selama 10 minit.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Tidak dapat mendaftar nama: kata laluan akaun salah.</string>
- <string name="register_name_invalid">Tidak dapat mendaftar nama: nama tidak sah.</string>
- <string name="register_name_already_taken">Tidak dapat mendaftar nama: nama telah digunakan pengguna lain.</string>
- <string name="register_name_network_error">Tidak dapat mendaftar nama: rangkaian atau server gagal.</string>
<string name="error_username_empty">Masukkan nama pengguna</string>
<string name="no_registered_name_for_account">Tiada nama berdaftar dengan akaun ini ditemui</string>
<string name="register_name">Daftarkan nama</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings_call.xml b/ring-android/app/src/main/res/values-ms/strings_call.xml
index 86cb127ebfce004e1f8cf1ba646697ef93c109f2..03140801169ea023da999117759eae89e18609b0 100644
--- a/ring-android/app/src/main/res/values-ms/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Selesai</string>
<string name="call_human_state_none">Tiada</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Aktif tersambung</string>
- <string name="conference_human_state_active_detached">Aktif terputus</string>
- <string name="conference_human_state_active_attached_rec">Rakam aktif tersambung</string>
- <string name="conference_human_state_active_detached_rec">Rakam aktif terputus</string>
- <string name="conference_human_state_hold">Tangguh</string>
- <string name="conference_human_state_hold_rec">Tangguh rakam</string>
- <string name="conference_human_state_default">Tiada</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index 5828c3123c055565619e04bdedd589dd3e65b754..b20d9dacd85bb2aebf1f4d6196dd1ceaa48bd467 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -12,7 +12,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Mangler nettverksforbindelse</string>
<!--AB menus-->
- <string name="ab_account_creation">Ny konto</string>
<string name="ab_action_chat">Tekstmelding</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -26,24 +25,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Slå et nummer</string>
<!--History Fragment-->
- <string name="hist_replay_button_stop">Stopp</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d samtale</item>
<item quantity="other">%d samtaler</item>
</plurals>
- <string name="home_transfer_complet">Overføring er ferdig</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Fant ingen kontakter</string>
- <string name="starred_contacts_title">Favoritter</string>
<string name="searchbar_hint">Skriv inn navn eller telefonnummer...</string>
<string name="choose_number">Velg et nummer</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Overfør til en annen pågående samtale:</string>
- <string name="transfer_no_other_call">Ingen andre samtaler som venter</string>
- <string name="transfer_type_number">Type nummer å overføre til:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Innkommende samtale fra %1$s</string>
<string name="notif_incoming_call">Innkommende samtale</string>
@@ -53,8 +45,6 @@
<string name="notif_current_call">Pågående samtale</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Deg:</string>
- <string name="action_call_attended_transfer">Deltagende overføring</string>
- <string name="action_call_conference">Konferanse</string>
<string name="action_call_hangup">Legg på</string>
<string name="ongoing_call">Pågående samtale</string>
<string name="hist_in_call">Innkommende samtale med %1$s</string>
@@ -76,7 +66,6 @@
<string name="send_message">Send melding</string>
<string name="message_sending">Sender melding...</string>
<string name="time_just_now">Akkurat nå</string>
- <string name="permission_read_denied">Denne app-en fikk ikke lov til å lese fra lagringsområdet ditt. Dermed kan den ikke fungere som det skal. Vær så snill å vurder om den kan få lov til dette.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamerarettigheter</string>
<string name="permission_dialog_camera_message">Videosamtaler krever tilgang til kameraet for å virke. Vurder å aktivere det.</string>
@@ -101,7 +90,6 @@
<string name="account_create_title">Opprett en Ring-konto</string>
<string name="wizard_next">Neste</string>
<!--MenuHeaderView-->
- <string name="unknown">Ukjent</string>
<!--Share fragment-->
<string name="generic_error_migration">Feil</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index 952138e52695009f34ce0e6c0e6bf51f8eda4529..73c18a4f8f58c64a3f497739b84ca9579c9171fc 100644
--- a/ring-android/app/src/main/res/values-nb/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -81,12 +81,8 @@ Du kan endre kontoen din senere</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">RTP-portintervall for tale</string>
<!--restore/backup-->
- <string name="account_restore_message">Skriv inn passord for å dekryptere filen.</string>
- <string name="account_restore_decryption_password">Dekrypteringspassord</string>
- <string name="restore_backup_wait">Vennligst vent...</string>
<string name="error_password_char_count">minimum 6 tegn</string>
<string name="error_passwords_not_equals">Passordene stemmer ikke</string>
- <string name="restore_failed_dialog_msg">Det skjedde en feil</string>
<string name="export_account_wait_title">Vennligst vent...</string>
<string name="account_export_end_error_title">Feil</string>
<string name="account_new_button">Opprett en Ring-konto</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings_call.xml b/ring-android/app/src/main/res/values-nb/strings_call.xml
index 951623caa249e0e0e65f66ff7c2ad22e135735f3..a47979e24895db7a357193004f3d6bdc2249251d 100644
--- a/ring-android/app/src/main/res/values-nb/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Over</string>
<string name="call_human_state_none">Ingen</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Aktive tilkoblet</string>
- <string name="conference_human_state_active_detached">Aktive frakoblet</string>
- <string name="conference_human_state_active_attached_rec">Aktive tilkoblet oppt</string>
- <string name="conference_human_state_active_detached_rec">Aktive frakoblet oppt</string>
- <string name="conference_human_state_hold">Parker</string>
- <string name="conference_human_state_hold_rec">Parker oppt</string>
- <string name="conference_human_state_default">Ingen</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 4ccf597db8277645cc8a5a3970c0175fa81e8fc1..6c8c55f4bc17f1365585956bc701f7432dece7bf 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -10,7 +10,6 @@
<string name="title_activity_sflphone_home">Bellen</string>
<string name="error_no_network">Geen netwerkverbinding</string>
<!--AB menus-->
- <string name="ab_account_creation">Nieuw account</string>
<!--Left Drawer-->
<!--Accessibility-->
<!--Sections-->
@@ -19,18 +18,13 @@
<string name="menu_item_about">Over Ring</string>
<!--Dialing Fragment-->
<!--History Fragment-->
- <string name="hist_replay_button">Opnieuw afspelen</string>
- <string name="hist_replay_button_stop">Stoppen</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<!--ContactList Fragment-->
- <string name="no_contact_found">Geen contact gevonden</string>
- <string name="starred_contacts_title">Favorieten</string>
<string name="searchbar_hint">Voer een naam of telefoonnummer in...</string>
<string name="choose_number">Kies een nummer</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_no_other_call">Geen andere gesprekken in de wacht</string>
<!--Notifications-->
<!--Call Fragment-->
<string name="action_call_hangup">Ophangen</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index cee0b99757b14feed98c0fe1c67355f8e76033ee..502c186e869585039e7aa69213edbd1eec63c0a1 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">Geen netwerkverbinding</string>
<string name="error_mobile_network_available_but_disabled">Graag toegang geven tot mobiel netwerk in de instellingen.</string>
<!--AB menus-->
- <string name="ab_account_creation">Account aanmaken</string>
<string name="ab_action_chat">Tekstberichten</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,31 +35,21 @@
<string name="menu_item_accounts">Accounts beheren</string>
<string name="menu_item_settings">Instellingen</string>
<string name="menu_item_share">Deel mijn contact</string>
- <string name="menu_item_blacklist">Geblokkeerde contacten</string>
<string name="menu_item_about">Over Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Kies een nummer</string>
<!--History Fragment-->
- <string name="hist_replay_button">Opnieuw afspelen</string>
- <string name="hist_replay_button_stop">Stoppen</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d gesprek</item>
<item quantity="other">%d gesprekken</item>
</plurals>
- <string name="home_transfering">%1$s wordt verstuurd naar %2$s</string>
- <string name="home_transfer_complet">Overdracht compleet</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Geen contacten gevonden</string>
- <string name="starred_contacts_title">Favorieten</string>
<string name="searchbar_hint">Voer een naam of telefoonnummer in...</string>
<string name="choose_number">Kies een nummer</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Versturen naar een andere lopende oproep:</string>
- <string name="transfer_no_other_call">Geen verdere oproepen in behandeling</string>
- <string name="transfer_type_number">Nummer ingeven om naar te versturen:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Gemiste inkomende oproep</string>
<string name="notif_missed_outgoing_call">Mislukte uitgaande oproep</string>
@@ -72,8 +61,6 @@
<string name="notif_current_call">Huidige oproep</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Jij:</string>
- <string name="action_call_attended_transfer">Bijgewoonde overdracht</string>
- <string name="action_call_conference">Vergadering</string>
<string name="action_call_hangup">Ophangen</string>
<string name="ongoing_call">Lopende oproep</string>
<string name="hist_in_call">Inkomende oproep van %1$s</string>
@@ -96,7 +83,6 @@
<string name="send_message">Bericht versturen</string>
<string name="message_sending">Bericht wordt verstuurd...</string>
<string name="time_just_now">Zojuist</string>
- <string name="permission_read_denied">De applicatie heeft geen machtiging om je opslag te lezen en kan daardoor niet correct functioneren. Gelieve te overwegen deze machtiging toch toe te kennen</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Cameramachtiging</string>
<string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
@@ -138,7 +124,6 @@
<string name="open_the_gallery">Galerij openen</string>
<string name="take_a_photo">Foto nemen</string>
<string name="profile_name_hint">Voer je naam in (optioneel)</string>
- <string name="unknown">Onbekend</string>
<!--Share fragment-->
<string name="share_message">Scan deze QR-code met de ingebouwde scanner van de Ring-toepassing die met je wil communiceren.</string>
<string name="share_message_no_account">Selecteer een account om te delen.</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index 754c4103d2679f400a34a936e7afd61b67f8bef7..1eedbf0237bcae78f94abec6e673d5cca9df9175 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -104,16 +104,9 @@ Je kan je account later bewerken</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Audio RTP-poortenreeks</string>
<!--restore/backup-->
- <string name="account_restore_account">Een account herstellen</string>
- <string name="account_restore_message">Voer wachtwoord in om het bestand te ontsleutelen.</string>
- <string name="account_restore_decryption_password">Ontsleutelingswachtwoord</string>
<string name="account_new_device_password">Voer hoofdwachtwoord in om account te ontgrendelen</string>
- <string name="restore_dialog_title">Herstellen</string>
- <string name="restore_backup_wait">Even geduld...</string>
<string name="error_password_char_count">Minimaal 6 tekens</string>
<string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
- <string name="restore_failed_dialog_title">Herstellen mislukt</string>
- <string name="restore_failed_dialog_msg">Er is een fout opgetreden</string>
<string name="export_account_wait_title">Even geduld...</string>
<string name="export_account_wait_message">Nieuwe accountinformatie wordt gepubliceerd</string>
<string name="account_export_end_decryption_message">Kon je account niet ontgrendelen met het opgegeven wachtwoord.</string>
@@ -132,8 +125,6 @@ Je kan je account later bewerken</string>
<string name="account_migration_title_dialog">Accountmigratie</string>
<string name="account_migration_message_dialog">Je account moeten bijgewerkt worden. Wil je naar het accountbeheerscherm gaan om deze handeling uit te voeren?</string>
<string name="account_update_needed">Update vereist</string>
- <string name="account_creation_file_too_big">Bestand is te groot</string>
- <string name="account_cannot_read">Kan %1$s niet lezen</string>
<string name="account_cannot_be_found_title">Account kan niet gevonden worden</string>
<string name="account_cannot_be_found_message">Account kon niet gevonden worden op het Ring-netwerk.\nControleer of de account geëxporteerd is van een bestaand apparaat en dat de ingevoerde gebruikersreferenties correct zijn</string>
<string name="account_sip_cannot_be_registered_message">Je kan doorgaan met het aanmaken van je account of je gegevens hier aanpassen. Aanpassen is later ook mogelijk vanuit de accountinstellingen.</string>
@@ -148,9 +139,7 @@ Je kan je account later bewerken</string>
<string name="account_sip_success_message">Je SIP-account is met succes geregistreerd.</string>
<string name="account_sip_register_anyway">Toch registreren</string>
<string name="account_link_button">Dit apparaat aan een account koppelen</string>
- <string name="account_import_title">Koppelen aan een bestaande account</string>
<string name="account_link_prompt_pin">Voer PIN-code in</string>
- <string name="account_wizard_title">Welkom bij</string>
<string name="account_new_button">Een Ring-account aanmaken</string>
<string name="account_link_export_button">Een ander apparaat aan deze account koppelen</string>
<string name="account_link_export_info">Om deze account op andere apparaten te gebruiken moet je deze eerst op Ring blootstellen. Er zal een PIN-code gegenereerd worden die je op het nieuwe apparaat invoert om de account in te stellen. De PIN-code is 10 minuten geldig. \n\nVoer je wachtwoord in om te beginnen:</string>
@@ -158,10 +147,6 @@ Je kan je account later bewerken</string>
<string name="account_end_export_button">sluiten</string>
<string name="account_end_export_infos">Je PIN-code is:\n\n%%\n\nOm het proces te voltooien open je Ring op het nieuwe apparaat. Maak een account aan met \"Dit apparaat aan een account koppelen\". De PIN-code is 10 minuten geldig.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Kan naam niet registreren: verkeerd accountwachtwoord.</string>
- <string name="register_name_invalid">Kan naam niet registreren: ongeldige naam.</string>
- <string name="register_name_already_taken">Kan naam niet registreren: naam reeds in gebruik.</string>
- <string name="register_name_network_error">Kan naam niet registreren: netwerk- of serverfout.</string>
<string name="error_username_empty">Voer een gebruikersnaam in</string>
<string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor deze account</string>
<string name="register_name">Naam registreren</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_call.xml b/ring-android/app/src/main/res/values-nl/strings_call.xml
index 085ee90f57412cfa2440cecb6b63cfc48765ca6b..bfab031b0c0841b0964c3dfbb4f4f8fcd8256094 100644
--- a/ring-android/app/src/main/res/values-nl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Over</string>
<string name="call_human_state_none">Geen</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Actief aangesloten</string>
- <string name="conference_human_state_active_detached">Actief losgekoppeld</string>
- <string name="conference_human_state_active_attached_rec">Actief aangesloten rec</string>
- <string name="conference_human_state_active_detached_rec">Actief losgekoppeld rec</string>
- <string name="conference_human_state_hold">In wacht zetten</string>
- <string name="conference_human_state_hold_rec">In wacht zetten rec</string>
- <string name="conference_human_state_default">Geen</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 50db5e3500e80a1def692e411cb10227b2685be4..34828fd37122c182bb910b12267960578d468e22 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -5,7 +5,6 @@
<!--RingActivity-->
<string name="title_activity_sflphone_home">ਰਿੰਗ</string>
<!--AB menus-->
- <string name="ab_account_creation">ਨਵਾਂ ਖਾਤਾ</string>
<!--Left Drawer-->
<!--Accessibility-->
<!--Sections-->
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index a02232ae4995d5206beb1d3df22f7a35d6be2aa9..3519a4e863bdf80b22f7c81542f9d72ec3c45b97 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -14,7 +14,6 @@
<string name="error_no_network">Brak połączenia z siecią</string>
<string name="error_mobile_network_available_but_disabled">Proszę w ustawieniach udzielić dostępu do sieci komórkowej.</string>
<!--AB menus-->
- <string name="ab_account_creation">Nowe konto</string>
<string name="ab_action_chat">Tekstowe powiadamiania</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,8 +27,6 @@
<!--Dialing Fragment-->
<string name="dial_number">Wykręć numer</string>
<!--History Fragment-->
- <string name="hist_replay_button">Powtórz</string>
- <string name="hist_replay_button_stop">Zatrzymaj</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -38,17 +35,11 @@
<item quantity="many">%d Rozmowy</item>
<item quantity="other">%d Rozmowy</item>
</plurals>
- <string name="home_transfer_complet">Przełaczanie skończone</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Brak kontaktu</string>
- <string name="starred_contacts_title">Ulubione kontakty</string>
<string name="searchbar_hint">Wpisz nazwisko albo numer telefonu...</string>
<string name="choose_number">Wybierz numer</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Przełaczenie do innego bieżącego połączenia:</string>
- <string name="transfer_no_other_call">Żadne inne połączenia nie są oczekiwane</string>
- <string name="transfer_type_number">Wpisz numer do którego chcesz się przełączyć</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Połączenie przychodzące od %1$s</string>
<string name="notif_incoming_call">Połączenie przychodzące</string>
@@ -58,8 +49,6 @@
<string name="notif_current_call">Aktualna rozmowa</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Ty:</string>
- <string name="action_call_attended_transfer">Ogłoszone przełaczenie</string>
- <string name="action_call_conference">Konferencja</string>
<string name="action_call_hangup">Odłoż słuchawkę</string>
<string name="ongoing_call">Trwa połączenie</string>
<string name="hist_in_call">Czas przychodzączego połączenia: %1$s</string>
@@ -81,7 +70,6 @@
<string name="send_message">Wyślij wiadomość</string>
<string name="message_sending">Trwa wysyłanie wiadomości...</string>
<string name="time_just_now">W tej chwili</string>
- <string name="permission_read_denied">Aplikacja nie może odczytać pamięci. Stąd, nie może funkcjonować prawidłowo. Proszę rozważyć przydzielenie jej uprawnień</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Uprawnienia do aparatu</string>
<string name="permission_dialog_camera_message">Wideorozmowa wymaga przyznania uprawnień dla aparatu. Proszę rozważyć odblokowanie jej.</string>
@@ -109,7 +97,6 @@
<string name="account_create_title">Stwórz konto Ring</string>
<string name="wizard_next">Następne</string>
<!--MenuHeaderView-->
- <string name="unknown">Nieznane</string>
<!--Share fragment-->
<string name="generic_error_migration">Błąd</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/ring-android/app/src/main/res/values-pl/strings_account.xml
index 49540e190e26f19e143d3153b553922403a35663..4b00dc9e9db408872028e4bbf1a31d9ebc54ecdb 100644
--- a/ring-android/app/src/main/res/values-pl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_account.xml
@@ -84,12 +84,8 @@ Możesz edytować swoje konto później</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Zakres Portów Audio RTP</string>
<!--restore/backup-->
- <string name="account_restore_message">Wprowadź hasło, aby odszyfrować plik.</string>
- <string name="account_restore_decryption_password">Hasło rozszyfrowania</string>
- <string name="restore_backup_wait">Proszę czekać…</string>
<string name="error_password_char_count">minimum 6 znaków</string>
<string name="error_passwords_not_equals">Hasła nie pasują do siebie</string>
- <string name="restore_failed_dialog_msg">Wystąpił błąd</string>
<string name="export_account_wait_title">Proszę czekać…</string>
<string name="account_export_end_error_title">Błąd</string>
<string name="account_new_button">Stwórz konto Ring</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings_call.xml b/ring-android/app/src/main/res/values-pl/strings_call.xml
index d80ea3acbebecf675b6cf2d56e3e8c757a1ed05a..a9d92d2bf9937432745396ac382bde09aef89a2f 100644
--- a/ring-android/app/src/main/res/values-pl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Koniec</string>
<string name="call_human_state_none">Nic</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Aktywny załącznik</string>
- <string name="conference_human_state_active_detached">Aktywnie oderwany</string>
- <string name="conference_human_state_active_attached_rec">Aktywnie podłączony nagrywanie</string>
- <string name="conference_human_state_active_detached_rec">Aktywnie oderwany nagrywanie</string>
- <string name="conference_human_state_hold">Czekanie</string>
- <string name="conference_human_state_hold_rec">Przytrzymaj rec</string>
- <string name="conference_human_state_default">Nic</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index aaf039131321d8240327fe0155ef39eae610d271..c3acc6537d22e8f959e60b4bffa6780e4255b502 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -24,7 +24,6 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recent
<string name="error_no_network">Sem conectividade</string>
<string name="error_mobile_network_available_but_disabled">Por favor, conceda acesso a rede do celular na tela de configurações .</string>
<!--AB menus-->
- <string name="ab_account_creation">Nova conta</string>
<string name="ab_action_chat">Mensagens de texto</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,31 +35,21 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recent
<string name="menu_item_accounts">Gerenciar contas</string>
<string name="menu_item_settings">Configurações</string>
<string name="menu_item_share">Compartilhar meu contato</string>
- <string name="menu_item_blacklist">Contatos bloqueados</string>
<string name="menu_item_about">Sobre o Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Disque um número</string>
<!--History Fragment-->
- <string name="hist_replay_button">Repetir</string>
- <string name="hist_replay_button_stop">Parar</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversa</item>
<item quantity="other">%d Conversas</item>
</plurals>
- <string name="home_transfering">Transferindo %1$s para %2$s</string>
- <string name="home_transfer_complet">Transferência completa</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nenhum contato encontrado</string>
- <string name="starred_contacts_title">Favoritos</string>
<string name="searchbar_hint">Digite nome ou número de telefone</string>
<string name="choose_number">Escolhe um número</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transferir para outra chamada atual:</string>
- <string name="transfer_no_other_call">Nenhuma outra chamada pendente</string>
- <string name="transfer_type_number">Digite o número para transferir:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Chamadas recebidas perdidas</string>
<string name="notif_missed_outgoing_call">Chamadas efetuadas perdidas</string>
@@ -72,8 +61,6 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recent
<string name="notif_current_call">Chamada atual</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Você:</string>
- <string name="action_call_attended_transfer">Transferência atendida</string>
- <string name="action_call_conference">Conferência</string>
<string name="action_call_hangup">Desligar</string>
<string name="ongoing_call">Chamada em andamento</string>
<string name="hist_in_call">Recebimento de chamada %1$s</string>
@@ -96,7 +83,6 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recent
<string name="send_message">Enviar mensagem</string>
<string name="message_sending">Enviando mensagem...</string>
<string name="time_just_now">Agora há pouco</string>
- <string name="permission_read_denied">Não foi permitido acessar o armazenamento. Por isso, o aplicativo não pôde funcionar corretamente. Considere permitir este acesso.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permissão de câmera</string>
<string name="permission_dialog_camera_message">Conversas de vídeo requerem permissão para acesso à câmera. Considere habilitá-la.</string>
@@ -138,7 +124,6 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recent
<string name="open_the_gallery">Abrir a galeria</string>
<string name="take_a_photo">Tirar uma foto</string>
<string name="profile_name_hint">Insira o seu nome (opcional)</string>
- <string name="unknown">Desconhecido</string>
<!--Share fragment-->
<string name="share_message">Escaneie o QRCode com o escaner embutido da aplicação Ring que deseja se comunicar com você.</string>
<string name="share_message_no_account">Por favor selecione uma conta para compartilhar.</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index b678ac0be1db6922dbacff72ec45e04bcf61e3a9..8c49dc539ce5b55982f1fc446379b66a915e4a95 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -104,16 +104,9 @@ Você pode editar sua conta depois.</string>
<string name="account_rtp_min_port">Mínimo</string>
<string name="account_rtp_port_range">Variação de portas de audio RTP</string>
<!--restore/backup-->
- <string name="account_restore_account">Restaurar uma conta</string>
- <string name="account_restore_message">Digite a senha para descriptografar o arquivo.</string>
- <string name="account_restore_decryption_password">Senha de descriptografia</string>
<string name="account_new_device_password">Entre com a senha principal para desbloquear conta</string>
- <string name="restore_dialog_title">Restaurando</string>
- <string name="restore_backup_wait">Por favor, aguarde...</string>
<string name="error_password_char_count">Pelo menos 6 caracteres</string>
<string name="error_passwords_not_equals">Senhas não correspondem</string>
- <string name="restore_failed_dialog_title">Falha na restauração</string>
- <string name="restore_failed_dialog_msg">Um erro ocorreu</string>
<string name="export_account_wait_title">Por favor, aguarde...</string>
<string name="export_account_wait_message">Propagando informação da nova conta</string>
<string name="account_export_end_decryption_message">Não foi possível desbloquear sua conta utilizando a senha fornecida.</string>
@@ -132,8 +125,6 @@ Você pode editar sua conta depois.</string>
<string name="account_migration_title_dialog">Migração de conta</string>
<string name="account_migration_message_dialog">Sua conta precisa ser atualizada. Você deseja ir na tela de administração da conta para fazer isto?</string>
<string name="account_update_needed">Atualização necessária</string>
- <string name="account_creation_file_too_big">Arquivo muito grande</string>
- <string name="account_cannot_read">Não foi possível ler %1$s</string>
<string name="account_cannot_be_found_title">Não foi possível localizar conta</string>
<string name="account_cannot_be_found_message">Não foi possível localizar a conta na rede Ring.\nCertifique-se de que foi exportada no Ring de um dispositivo existente, e que as informações fornecidas estão corretas.</string>
<string name="account_sip_cannot_be_registered_message">Você pode continuar com o processo de criação de conta ou editar suas informações aqui. A edição também é possível mais tarde nas configurações de conta.</string>
@@ -148,9 +139,7 @@ Você pode editar sua conta depois.</string>
<string name="account_sip_success_message">Você registrou sua conta SIP com sucesso.</string>
<string name="account_sip_register_anyway">Registrar mesmo assim</string>
<string name="account_link_button">Associar este dispositivo a uma conta</string>
- <string name="account_import_title">Associar à uma conta existente</string>
<string name="account_link_prompt_pin">Entre o PIN</string>
- <string name="account_wizard_title">Bem Vindo a</string>
<string name="account_new_button">Criar uma conta no Ring</string>
<string name="account_link_export_button">Associar outro dispositivo à esta conta.</string>
<string name="account_link_export_info">Para usar esta conta em outros dispositivos, você deve antes expô-la no Ring. Isso gerará um código PIN que você deverá entrar no novo dispositivo para configurar a conta. Este PIN é válido por 10 minutos. \n\n Por favor, forneça sua senha para iniciar:</string>
@@ -158,10 +147,6 @@ Você pode editar sua conta depois.</string>
<string name="account_end_export_button">fechar</string>
<string name="account_end_export_infos">Seu PIN é:\n\n%%\n\nPara completar o processo, você deve abrir o Ring no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo à uma conta\". Seu PIN é válido por 10 minutos.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Não foi possível registrar nome: senha da conta errada.</string>
- <string name="register_name_invalid">Não foi possível registrar nome: nome inválido.</string>
- <string name="register_name_already_taken">Não foi possível registrar nome: nome já utilizado.</string>
- <string name="register_name_network_error">Não foi possível registrar nome: erro de rede ou servidor.</string>
<string name="error_username_empty">Entre um nome de usuário</string>
<string name="no_registered_name_for_account">Nenhum nome registrado encontrado para esta conta</string>
<string name="register_name">Registrar nome</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
index 21d8dc0cdb9e0f9a7a02e7e25d7ed3d7724c9ea0..a0a07104e48e2ca8bd949879caad245cb3f6f258 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Sobre</string>
<string name="call_human_state_none">Nenhum</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Ativo anexado</string>
- <string name="conference_human_state_active_detached">Ativo individual</string>
- <string name="conference_human_state_active_attached_rec">Gravação ativa anexada</string>
- <string name="conference_human_state_active_detached_rec">Gravação ativa individual</string>
- <string name="conference_human_state_hold">Modo de espera</string>
- <string name="conference_human_state_hold_rec">Gravação de espera</string>
- <string name="conference_human_state_default">Nenhum</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index dba8a623872d540bc1b5b7a8cc067865a6969fdd..0639ee29be435ccf417a87ac0f502e036c41e677 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -12,7 +12,6 @@
<string name="error_no_network">Sem conexão de rede</string>
<string name="error_mobile_network_available_but_disabled">Por favor, permita o acesso à rede móvel nas definições do dispositivo.</string>
<!--AB menus-->
- <string name="ab_account_creation">Criar conta</string>
<string name="ab_action_chat">Mensagem de texto</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -25,25 +24,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Marcar um número</string>
<!--History Fragment-->
- <string name="hist_replay_button">Reproduzir novamente</string>
- <string name="hist_replay_button_stop">Parar</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Conversa</item>
<item quantity="other">%d Conversas</item>
</plurals>
- <string name="home_transfer_complet">Transferência completa</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Contacto não encontrado</string>
- <string name="starred_contacts_title">Favoritos</string>
<string name="searchbar_hint">Introduza um nome ou número de telemóvel...</string>
<string name="choose_number">Escolha um número</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Transferir para outra chamada em curso:</string>
- <string name="transfer_no_other_call">Sem chamadas pendentes</string>
- <string name="transfer_type_number">Insira o número para onde pretende transferir:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">A receber chamada de %1$s</string>
<string name="notif_incoming_call">A receber chamada</string>
@@ -51,7 +42,6 @@
<string name="notif_current_call">Chamada atual</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Tu:</string>
- <string name="action_call_conference">Conferência</string>
<string name="action_call_hangup">Desligar</string>
<string name="ongoing_call">Chamada em curso</string>
<string name="hist_in_call">A receber chamada de %1$s</string>
@@ -72,7 +62,6 @@
<string name="send_message">Enviar mensagem</string>
<string name="message_sending">Enviando a mensagem...</string>
<string name="time_just_now">Agora mesmo</string>
- <string name="permission_read_denied">A aplicação não está autorizada a consultar o armazenamento do dispositivo, pelo que poderá não funcionar adequadamente. Por favor, considere garantir esta permissão.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Permissão de câmara</string>
<string name="permission_dialog_camera_message">As conversações por vídeo requerem a permissão da câmara. Por favor, considere garanti-la. </string>
@@ -109,7 +98,6 @@
<string name="profile">O meu perfil</string>
<string name="open_the_gallery">Abrir galeria</string>
<string name="take_a_photo">Capturar fotografia</string>
- <string name="unknown">Desconhecido</string>
<!--Share fragment-->
<string name="share_your_account_information">Partilhar a minha informação de contacto</string>
<string name="generic_error_migration">Erro</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_call.xml b/ring-android/app/src/main/res/values-pt/strings_call.xml
index 6038be57b98bd40aa8706ff9e3ce71ea26bb5463..f3b3eb281ce489c454dd62c277681526ac92d933 100644
--- a/ring-android/app/src/main/res/values-pt/strings_call.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_call.xml
@@ -22,5 +22,4 @@ along with this program; if not, write to the Free Software
-->
<resources>
<string name="call_human_state_hold">Espera</string>
- <string name="conference_human_state_hold">Espera</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/ring-android/app/src/main/res/values-ro/strings.xml
index aee18e187975c0ef78a1e90ecb4ec974f70673c0..fb2763abf2336bb3658c97c8a20590c837716630 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -19,7 +19,6 @@
<string name="title_activity_sflphone_home">Suna</string>
<string name="error_no_network">Nu exista conectivitate la retea</string>
<!--AB menus-->
- <string name="ab_account_creation">Cont nou</string>
<string name="ab_action_chat">Mesaje text</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -33,13 +32,9 @@
<string name="menu_item_about">Despre Ring</string>
<!--Dialing Fragment-->
<!--History Fragment-->
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
- <string name="home_transfer_complet">Transfer Complet</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Nici un contact găsit</string>
- <string name="starred_contacts_title">Favoriți</string>
<string name="searchbar_hint">Introdu numele sau numărul de telefon</string>
<string name="choose_number">Alege un număr</string>
<!--FileExplorerDFragement-->
@@ -51,7 +46,6 @@
<string name="notif_current_call">Apelul curent</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Tu:</string>
- <string name="action_call_conference">Conferință</string>
<string name="action_call_hangup">Închide</string>
<string name="start_error_title">Ring nu a putut starta!</string>
<string name="action_call_decline">Refuză</string>
@@ -85,7 +79,6 @@
<!--MenuHeaderView-->
<string name="profile">Profilul meu</string>
<string name="open_the_gallery">Deschide galeria</string>
- <string name="unknown">Necunoscut</string>
<!--Share fragment-->
<string name="generic_error_migration">Eroare</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-ro/strings_account.xml b/ring-android/app/src/main/res/values-ro/strings_account.xml
index 337c0ec9c8ca50843a80812ebb57ad21fddac9e0..c1ef71a00f9a6394be2d9e6b17839ecf627a11cd 100644
--- a/ring-android/app/src/main/res/values-ro/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro/strings_account.xml
@@ -34,8 +34,6 @@
<string name="account_rtp_max_port">Maximal</string>
<string name="account_rtp_min_port">Minimal</string>
<!--restore/backup-->
- <string name="account_restore_account">Restabiliți contul</string>
- <string name="restore_backup_wait">Așteptați vă rog...</string>
<string name="export_account_wait_title">Așteptați vă rog...</string>
<string name="account_export_end_error_title">Eroare</string>
<string name="account_new_button">Creați un cont Ring</string>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index 426767c5022f27692f177304a680a62100ea7d97..9b54594257b9e899f707afd9c35549ac056e7934 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -14,7 +14,6 @@
<string name="error_no_network">Отсутствует сетевое подключение</string>
<string name="error_mobile_network_available_but_disabled">Пожалуйста, разрешите доступ к мобильной сети в настройках</string>
<!--AB menus-->
- <string name="ab_account_creation">Новая учетная запись</string>
<string name="ab_action_chat">Тестовое сообщение</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,8 +27,6 @@
<!--Dialing Fragment-->
<string name="dial_number">Набрать номер</string>
<!--History Fragment-->
- <string name="hist_replay_button">Ответ</string>
- <string name="hist_replay_button_stop">Стоп</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -38,17 +35,11 @@
<item quantity="many">%d Бесед</item>
<item quantity="other">%d беседы</item>
</plurals>
- <string name="home_transfer_complet">Перевод завершен</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Контакт не обнаружен</string>
- <string name="starred_contacts_title">Избранное</string>
<string name="searchbar_hint">Введите имя или номер телефона</string>
<string name="choose_number">Выбор номера</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Переход к другому текущему вызову:</string>
- <string name="transfer_no_other_call">Отсутствуют ожидающие вызовы</string>
- <string name="transfer_type_number">Укажите номер для перевода:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Входящий вызов от %1$s</string>
<string name="notif_incoming_call">Входящий вызов</string>
@@ -58,8 +49,6 @@
<string name="notif_current_call">Текущий вызов</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Вы</string>
- <string name="action_call_attended_transfer">Ручной перевод</string>
- <string name="action_call_conference">Конференция</string>
<string name="action_call_hangup">Завершить</string>
<string name="ongoing_call">Текущий вызов</string>
<string name="hist_in_call">Входящий вызов от %1$s</string>
@@ -81,7 +70,6 @@
<string name="send_message">Отправить сообщение</string>
<string name="message_sending">Отправка сообщения...</string>
<string name="time_just_now">В данный момент</string>
- <string name="permission_read_denied">Приложение не имеет прав чтения с накопителя, потому не может функционировать правильно. Пожалуйста, добавьте права доступа к хранилищу данных.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Разрешение на использование камеры</string>
<string name="permission_dialog_camera_message">Необходимо доступ к камере для работы с видеозвонками. Пожалуйста, предоставьте их.</string>
@@ -109,7 +97,6 @@
<string name="account_create_title">Создать Ring аккаунт</string>
<string name="wizard_next">Далее</string>
<!--MenuHeaderView-->
- <string name="unknown">Неизвестно</string>
<!--Share fragment-->
<string name="generic_error_migration">Ошибка</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index 21ddbb297fa43fde97d6ebbf8c54b104eb6ae179..9b95a4ff5e6266d527d83c1d43a2a00ef02cf59c 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -81,15 +81,10 @@
<string name="account_rtp_min_port">Минимум</string>
<string name="account_rtp_port_range">Диапазон портов RTP</string>
<!--restore/backup-->
- <string name="account_restore_message">Введите пароль для расшифровки файла.</string>
- <string name="account_restore_decryption_password">Дешифрование паролья</string>
- <string name="restore_backup_wait">Пожалуйста, подождите...</string>
<string name="error_password_char_count">Минимум 6 символов</string>
<string name="error_passwords_not_equals">Пароли не совпадают</string>
- <string name="restore_failed_dialog_msg">Произошла ошибка</string>
<string name="export_account_wait_title">Пожалуйста, подождите...</string>
<string name="account_export_end_error_title">Ошибка</string>
- <string name="account_wizard_title">Добро пожаловать в</string>
<string name="account_new_button">Создать Ring аккаунт</string>
<!--Name registration-->
<string name="account_status_connecting">Подключение</string>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
index 6b2b7090b1a4929d1f0af96311b393f1bd559dd4..6f65ab207da88bc3500377dc35af2ccda2b776b1 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
@@ -33,7 +33,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_unhold">Возврат</string>
<string name="call_human_state_over">Окончен</string>
<string name="call_human_state_none">Никто</string>
- <string name="conference_human_state_hold">Удержать</string>
- <string name="conference_human_state_hold_rec">Удержать запись</string>
- <string name="conference_human_state_default">Никто</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 4d46ca38dee4663e212c85e5fab6ca0311596397..d77b49bb97615cc386abc533b6bc260ae1280abf 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">Нет подключения к сети</string>
<string name="error_mobile_network_available_but_disabled">Пожалуйста, предоставьте доступ к сотовой сети в настройках.</string>
<!--AB menus-->
- <string name="ab_account_creation">Новый аккаунт</string>
<string name="ab_action_chat">Сообщения</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,13 +35,10 @@
<string name="menu_item_accounts">Управление аккаунтами</string>
<string name="menu_item_settings">Настройки</string>
<string name="menu_item_share">Поделиться моим контактом</string>
- <string name="menu_item_blacklist">Заблокированные контакты</string>
<string name="menu_item_about">О программе</string>
<!--Dialing Fragment-->
<string name="dial_number">Набрать номер</string>
<!--History Fragment-->
- <string name="hist_replay_button">Повторить</string>
- <string name="hist_replay_button_stop">Стоп</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -51,18 +47,11 @@
<item quantity="many">%d диалогов</item>
<item quantity="other">%d диалогов</item>
</plurals>
- <string name="home_transfering">Передача %1$s из %2$s</string>
- <string name="home_transfer_complet">Передача завершена</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Контактов не найдено</string>
- <string name="starred_contacts_title">Избранное</string>
<string name="searchbar_hint">Введите имя или номер телефона...</string>
<string name="choose_number">Выберите номер</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Переключение на другой вызов</string>
- <string name="transfer_no_other_call">Нет ожидающих вызовов</string>
- <string name="transfer_type_number">Тип номера для передачи:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Пропущенный входящий вызов</string>
<string name="notif_missed_outgoing_call">Пропущенный исходящий вызов</string>
@@ -74,8 +63,6 @@
<string name="notif_current_call">Текущий вызов</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Вы:</string>
- <string name="action_call_attended_transfer">Условная переадресация</string>
- <string name="action_call_conference">Конференция</string>
<string name="action_call_hangup">Повесить трубку</string>
<string name="ongoing_call">Исходящий вызов</string>
<string name="hist_in_call">Входящий звонок %1$s</string>
@@ -98,7 +85,6 @@
<string name="send_message">Отправить сообщение</string>
<string name="message_sending">Отправка сообщения...</string>
<string name="time_just_now">Только сейчас</string>
- <string name="permission_read_denied">Приложению не было разрешено чтение данных из памяти, поэтому оно не может работать должным образом. Пожалуйста, предоставьте ему это разрешение.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Разрешение на доступ к камере</string>
<string name="permission_dialog_camera_message">Видеосвязь требует для работы разрешения на доступ к камере. Пожалуйста, предоставьте его.</string>
@@ -140,7 +126,6 @@
<string name="open_the_gallery">Открыть галерею</string>
<string name="take_a_photo">Сделать фото</string>
<string name="profile_name_hint">Введите ваше имя (опционально)</string>
- <string name="unknown">Неизвестно</string>
<!--Share fragment-->
<string name="share_message">Отсканируйте этот QR-код встроенным сканером приложения Ring, которое хочет с вами связаться.</string>
<string name="share_message_no_account">Выберите аккаунт, которым хотите поделиться.</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 38ac49c5892b419e2c9b19ab9c9fd502436ee926..8087bb6ad8afc2eecf4f4dc78a4219077f1d37de 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -104,16 +104,9 @@
<string name="account_rtp_min_port">Минимум</string>
<string name="account_rtp_port_range">Диапазон портов для RTP-аудио</string>
<!--restore/backup-->
- <string name="account_restore_account">Восстановить аккаунт</string>
- <string name="account_restore_message">Введите пароль для расшифровки файла.</string>
- <string name="account_restore_decryption_password">Пароль расшифровки</string>
<string name="account_new_device_password">Введите основной пароль, чтобы разблокировать аккаунт</string>
- <string name="restore_dialog_title">Восстановление</string>
- <string name="restore_backup_wait">Пожалуйста, подождите…</string>
<string name="error_password_char_count">Минимум 6 символов</string>
<string name="error_passwords_not_equals">Пароли не совпадают</string>
- <string name="restore_failed_dialog_title">Восстановление не удалось</string>
- <string name="restore_failed_dialog_msg">Произошла ошибка</string>
<string name="export_account_wait_title">Пожалуйста, подождите…</string>
<string name="export_account_wait_message">Публикация информации о новом аккаунте</string>
<string name="account_export_end_decryption_message">Не удалось разблокировать аккаунт указанным паролем.</string>
@@ -132,8 +125,6 @@
<string name="account_migration_title_dialog">Перенос аккаунта</string>
<string name="account_migration_message_dialog">Ваш аккаунт требуется обновить. Хотите перейти на экран управления аккаунтом для выполнения этой операции?</string>
<string name="account_update_needed">Необходимо обновление</string>
- <string name="account_creation_file_too_big">Файл слишком большой</string>
- <string name="account_cannot_read">Не удалось прочитать %1$s</string>
<string name="account_cannot_be_found_title">Не удалось найти аккаунт</string>
<string name="account_cannot_be_found_message">Не удалось найти аккаунт в сети Ring.\nУдостоверьтесь, что он был экспортирован в сеть Ring с существующего устройства, и что предоставленные идентификационные данные верны.</string>
<string name="account_sip_cannot_be_registered_message">Можно продолжить создание учетной записи или изменить информацию здесь. Редактирование будет возможно и позже в настройках аккаунта.</string>
@@ -148,9 +139,7 @@
<string name="account_sip_success_message">Вы успешно зарегистрировали свой SIP-аккаунт.</string>
<string name="account_sip_register_anyway">Всё равно зарегистроваться</string>
<string name="account_link_button">Привязать это устройство к аккаунту</string>
- <string name="account_import_title">Привязать к существующему аккаунту</string>
<string name="account_link_prompt_pin">Введите PIN</string>
- <string name="account_wizard_title">Добро пожаловать в </string>
<string name="account_new_button">Создать аккаунт Ring</string>
<string name="account_link_export_button">Привязать другое устройство к этому аккаунту</string>
<string name="account_link_export_info">Для использования этого аккаунта на других устройствах нужно сначала выставить его в сеть Ring. Это сгенерирует PIN-код, который потребуется ввести на новом устройстве для настройки аккаунта. PIN-код действителен в течение 10 минут.\n\nПожалуйста, укажите ваш пароль, чтобы начать:</string>
@@ -158,10 +147,6 @@
<string name="account_end_export_button">закрыть</string>
<string name="account_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Не удалось зарегистрировать имя: неверный пароль аккаунта.</string>
- <string name="register_name_invalid">Не удалось зарегистрировать имя: недопустимое имя.</string>
- <string name="register_name_already_taken">Не удалось зарегистрировать имя: имя уже занято.</string>
- <string name="register_name_network_error">Не удалось зарегистрировать имя: ошибка сети или сервера.</string>
<string name="error_username_empty">Введите имя пользователя</string>
<string name="no_registered_name_for_account">Не найдено зарегистрированного имени для этого аккаунта</string>
<string name="register_name">Зарегистрировать имя</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_call.xml b/ring-android/app/src/main/res/values-ru/strings_call.xml
index 89f2794e48393b6396b475191a27e5dca36ec91f..a3da4ff927f35bdc3c06cc9e2dd1409ae0c9a3d7 100644
--- a/ring-android/app/src/main/res/values-ru/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Окончен</string>
<string name="call_human_state_none">Нет</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Активный прикреплен</string>
- <string name="conference_human_state_active_detached">Активный откреплен</string>
- <string name="conference_human_state_active_attached_rec">Активный прикреплен запись</string>
- <string name="conference_human_state_active_detached_rec">Активный откреплен запись</string>
- <string name="conference_human_state_hold">Удержать</string>
- <string name="conference_human_state_hold_rec">Удержать запись</string>
- <string name="conference_human_state_default">Нет</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 3a78af5b69c8468ffbcf9bd6f2d1d882d02c2d79..e710cb4fcf98ab375475e5b58a71b9bac3a3a48e 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -9,7 +9,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Žiadne sieťové pripojenie</string>
<!--AB menus-->
- <string name="ab_account_creation">Nový účet</string>
<string name="ab_action_chat">Textová správa</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -22,11 +21,9 @@
<!--Dialing Fragment-->
<string name="dial_number">Vytoč číslo</string>
<!--History Fragment-->
- <string name="hist_replay_button_stop">Stop</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<!--ContactList Fragment-->
- <string name="starred_contacts_title">Obľubené</string>
<string name="choose_number">Vyberte číslo</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
@@ -51,7 +48,6 @@
<string name="profile">Môj profil</string>
<string name="open_the_gallery">Otvor galériu</string>
<string name="take_a_photo">Sprav fotografiu</string>
- <string name="unknown">Neznámy</string>
<!--Share fragment-->
<string name="share_your_account_information">Zdielaj </string>
<string name="generic_error_migration">Chyba</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 7000652ff5582cbda7e163bf9aba6dfd80593760..bf0c5754c1fb132c7059a3b287a8b75eba6fa984 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -21,7 +21,6 @@
<string name="error_no_network">Pa lidhje në rrjet</string>
<string name="error_mobile_network_available_but_disabled">Ju lutemi, akordojini hyrje rrjetit celular te skena e rregullimeve.</string>
<!--AB menus-->
- <string name="ab_account_creation">Llogari e re</string>
<string name="ab_action_chat">Shkëmbim mesazhesh tekst</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,25 +35,17 @@
<!--Dialing Fragment-->
<string name="dial_number">Thirrni një numër</string>
<!--History Fragment-->
- <string name="hist_replay_button">Riluaje</string>
- <string name="hist_replay_button_stop">Ndale</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Bisedë</item>
<item quantity="other">%d Biseda</item>
</plurals>
- <string name="home_transfer_complet">Shpërngulje e plotësuar</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">S’u gjet kontakt</string>
- <string name="starred_contacts_title">Të parapëlqyer</string>
<string name="searchbar_hint">Jepni një emër ose një numër telefoni…</string>
<string name="choose_number">Zgjidhni një numër</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Shpërngule te një tjetër thirrje e tanishme:</string>
- <string name="transfer_no_other_call">S’ka thirrje të tjera pezull</string>
- <string name="transfer_type_number">Shtypni numrin te i cili të shpërngulet:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Thirrje ardhëse nga %1$s</string>
<string name="notif_incoming_call">Thirrje ardhëse</string>
@@ -64,7 +55,6 @@
<string name="notif_current_call">Thirrja e tanishme</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Ju:</string>
- <string name="action_call_conference">Konferencë</string>
<string name="action_call_hangup">Mbylle thirrjen</string>
<string name="ongoing_call">Thirrje në kryerje e sipër</string>
<string name="hist_in_call">Thirrje nga %1$s</string>
@@ -86,7 +76,6 @@
<string name="send_message">Dërgoje mesazhin</string>
<string name="message_sending">Po dërgohet mesazhi…</string>
<string name="time_just_now">Mu tani</string>
- <string name="permission_read_denied">Aplikacioni s’u lejua të lexonte te depozita juaj. Ndaj, s’mund të funksionojë si duhet. Ju lutemi, shihni mundësinë e akordimit për të kësaj lejeje</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Leje për kamerën</string>
<string name="permission_dialog_camera_message">Që të funksionojnë, bisedat me video lypin doemos leje për kamerën Ju lutemi, shihni mundësinë e akordimit të saj.</string>
@@ -125,7 +114,6 @@
<string name="profile">Profili im</string>
<string name="open_the_gallery">Hape galerinë</string>
<string name="take_a_photo">Bëni një foto</string>
- <string name="unknown">E panjohur</string>
<!--Share fragment-->
<string name="share_message_no_account">Ju lutemi, përzgjidhni një llogari për ndarje me të.</string>
<string name="share_your_account_information">Ndaji me të tjerët të dhënat e mia të kontaktit</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
index 59db22f2e9fdf43e5b422fab26dcb21e1e4e5114..421c32f8f0d362f331a39c254f159c18d3a4d445 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -90,15 +90,9 @@
<string name="account_rtp_max_port">Maksimum</string>
<string name="account_rtp_min_port">Minimum</string>
<!--restore/backup-->
- <string name="account_restore_account">Riktheni një llogari</string>
- <string name="account_restore_message">Jepni fjalëkalimin për çfshehtëzim kartele.</string>
- <string name="account_restore_decryption_password">Fjalëkalim çfeshhtëzimesh</string>
<string name="account_new_device_password">Që të zhbllokohet llogaria, jepni fjalëkalimin e përgjithshëm</string>
- <string name="restore_backup_wait">Ju lutemi, pritni…</string>
<string name="error_password_char_count">Minimumi 6 shenja</string>
<string name="error_passwords_not_equals">Fjalëkalimet nuk përputhen</string>
- <string name="restore_failed_dialog_title">Rikthimi dështoi</string>
- <string name="restore_failed_dialog_msg">Ndodhi një gabim</string>
<string name="export_account_wait_title">Ju lutemi, pritni…</string>
<string name="account_export_end_decryption_message">S’u zhbllokua dot llogaria juaj duke përdorur fjalëkalimin e dhënë.</string>
<string name="account_export_end_network_title">Gabim rrjeti</string>
@@ -116,8 +110,6 @@
<string name="account_migration_title_dialog">Migrim llogarie</string>
<string name="account_migration_message_dialog">Llogaritë tuaja lypset të përditësohen. Doni të kalohet te skena e administrimit të Llogarive që të kryeni këtë veprim?</string>
<string name="account_update_needed">Lypset përditësim</string>
- <string name="account_creation_file_too_big">Kartela është shumë e madhe</string>
- <string name="account_cannot_read">S’lexohet dot %1$s</string>
<string name="account_cannot_be_found_title">S’gjendet dot llogari</string>
<string name="account_sip_cannot_be_registered_message">Mund të vazhdoni me procesin e krijimit të llogarisë ose të përpunoni këtu të dhënat tuaja. Përpunimi është i mundshëm edhe më vonë, që nga rregullimet llogarie.</string>
<string name="account_no_network_title">S’lidhet dot te rrjeti</string>
@@ -127,16 +119,11 @@
<string name="account_sip_success_message">E regjistruat me sukses llogarinë tuaj SIP</string>
<string name="account_sip_register_anyway">Regjistroje sido qoftë</string>
<string name="account_link_button">Lidheni këtë pajisje me një llogari</string>
- <string name="account_import_title">Lidheni me një llogari ekzistuese</string>
<string name="account_link_prompt_pin">Jepni PIN-in</string>
<string name="account_new_button">Krijoni një llogari Ring</string>
<string name="account_link_export_button">Lidhni te kjo llogari një pajisje tjetër</string>
<string name="account_end_export_button">mbylle</string>
<!--Name registration-->
- <string name="register_name_wrong_password">S’regjistrohet dot emri: fjalëkalim llogarie i gabuar.</string>
- <string name="register_name_invalid">S’regjistrohet dot emri: emër i pavlefshëm.</string>
- <string name="register_name_already_taken">S’regjistrohet dot emri: emër tashmë i zënë.</string>
- <string name="register_name_network_error">S’regjistrohet dot emri: gabim rrjeti ose shërbyesi.</string>
<string name="error_username_empty">Jepni një emër përdoruesi</string>
<string name="no_registered_name_for_account">S’u gjet emër i regjistruar për këtë llogari</string>
<string name="register_name">Regjistroni emër</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
index c3cfec584a3e70ccf0a938aa6c4ce7dc0325fc91..507ecea6a78753950da740b3321a7ed9c66473cd 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
@@ -25,6 +25,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_failure">Dështoi</string>
<string name="call_human_state_hold">Mbaje</string>
<string name="call_human_state_none">Asnjë</string>
- <string name="conference_human_state_hold">Mbaje</string>
- <string name="conference_human_state_default">Asnjë</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 591ff0e003032d19ef321fc83429653b285f8b43..176fbfb627467d3cc89ca9d2ecbe06aaa8d85457 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -24,7 +24,6 @@
<string name="error_no_network">Ingen nätverksanslutning</string>
<string name="error_mobile_network_available_but_disabled">Bevilja tillgång till mobilnätet på inställningssidan.</string>
<!--AB menus-->
- <string name="ab_account_creation">Nytt konto</string>
<string name="ab_action_chat">Textmeddelande</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -36,31 +35,21 @@
<string name="menu_item_accounts">Hantera konton</string>
<string name="menu_item_settings">Inställningar</string>
<string name="menu_item_share">Dela min kontakt</string>
- <string name="menu_item_blacklist">Blockerade kontakter</string>
<string name="menu_item_about">Om Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">Slå ett nummer</string>
<!--History Fragment-->
- <string name="hist_replay_button">Svara</string>
- <string name="hist_replay_button_stop">Stopp</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d konversation</item>
<item quantity="other">%d konversationer</item>
</plurals>
- <string name="home_transfering">Överför %1$s till %2$s</string>
- <string name="home_transfer_complet">Överföring slutförd</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Ingen kontakt hittades</string>
- <string name="starred_contacts_title">Favoriter</string>
<string name="searchbar_hint">Ange namn eller telefonnummer...</string>
<string name="choose_number">Välj ett nummer</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Överför till ett annat aktuellt samtal:</string>
- <string name="transfer_no_other_call">Inga andra samtal väntar</string>
- <string name="transfer_type_number">Ange nummer att överföra till:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Missat inkommande samtal</string>
<string name="notif_missed_outgoing_call">Missat utgående samtal</string>
@@ -72,8 +61,6 @@
<string name="notif_current_call">Aktuellt samtal</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Du:</string>
- <string name="action_call_attended_transfer">Bevakad överföring</string>
- <string name="action_call_conference">Konferens</string>
<string name="action_call_hangup">Lägg på</string>
<string name="ongoing_call">Pågående samtal</string>
<string name="hist_in_call">Inkommande samtal av %1$s</string>
@@ -96,7 +83,6 @@
<string name="send_message">Skicka meddelande</string>
<string name="message_sending">Skickar meddelande...</string>
<string name="time_just_now">Just nu</string>
- <string name="permission_read_denied">Appen nekas att läsa från din lagringsplats. Överväg att tilldela appen läsrättigheter, annars kommer den inte att fungera korrekt.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamerarättighet</string>
<string name="permission_dialog_camera_message">Videokonversationer kräver kamerarättigheter. Överväg att aktivera det.</string>
@@ -138,7 +124,6 @@
<string name="open_the_gallery">Öppna galleriet</string>
<string name="take_a_photo">Ta ett foto</string>
<string name="profile_name_hint">Ange ditt namn (frivilligt)</string>
- <string name="unknown">Okänd</string>
<!--Share fragment-->
<string name="share_message">Skanna denna QR-kod med den inbyggda skanner som finns i det Ring-program som vill kommunicera med dig.</string>
<string name="share_message_no_account">Välj ett konto att dela.</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index d3cd3ea2a20e2c6f6b8cedd09721c89e4aa2b4a8..d1ed97b05d7834f19496fbd14002898360b750f3 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -104,16 +104,9 @@ Du kan ändra kontot senare.</string>
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Audio RTP portintervall</string>
<!--restore/backup-->
- <string name="account_restore_account">Återställ ett konto</string>
- <string name="account_restore_message">Ange lösenord för att dekryptera filen</string>
- <string name="account_restore_decryption_password">Dekrypteringslösenord</string>
<string name="account_new_device_password">Ange huvudlösenordet för att låsa upp kontot</string>
- <string name="restore_dialog_title">Återställer</string>
- <string name="restore_backup_wait">Vänta...</string>
<string name="error_password_char_count">6 tecken minimum</string>
<string name="error_passwords_not_equals">Lösenorden stämmer inte</string>
- <string name="restore_failed_dialog_title">Återställning misslyckades</string>
- <string name="restore_failed_dialog_msg">Et fel inträffade</string>
<string name="export_account_wait_title">Vänta...</string>
<string name="export_account_wait_message">Publicerar ny kontoinformation</string>
<string name="account_export_end_decryption_message">Kunde inte låsa upp ditt konto med det givna lösenordet.</string>
@@ -132,8 +125,6 @@ Du kan ändra kontot senare.</string>
<string name="account_migration_title_dialog">Kontodelning</string>
<string name="account_migration_message_dialog">Dina konton behöver uppdateras. Vill du gå till kontohanteringsfönstret för att uppdatera?</string>
<string name="account_update_needed">Uppdatering behövs</string>
- <string name="account_creation_file_too_big">Filen är för stor</string>
- <string name="account_cannot_read">Kan inte läsa %1$s</string>
<string name="account_cannot_be_found_title">Kan inte hitta kontot</string>
<string name="account_cannot_be_found_message">Kontot kunde inte hittas i Ring-nätverket.\nTillse att det har exporterats från en befintlig enhet och att angivna kontouppgifter är korrekt.</string>
<string name="account_sip_cannot_be_registered_message">Du kan fortsätta med kontoskapandet eller redigera din information här. Redigering är fortfarande möjlig i kontoinställningarna, vid ett senare tillfälle.</string>
@@ -148,9 +139,7 @@ Du kan ändra kontot senare.</string>
<string name="account_sip_success_message">Du har registrerat ditt SIP-konto.</string>
<string name="account_sip_register_anyway">Registrera i alla fall</string>
<string name="account_link_button">Koppla denna enhet till ett konto</string>
- <string name="account_import_title">Koppla ett befintligt konto</string>
<string name="account_link_prompt_pin">Ange PIN-kod</string>
- <string name="account_wizard_title">Välkommen till</string>
<string name="account_new_button">Skapa ett Ring-konto</string>
<string name="account_link_export_button">Koppla en annan enhet till detta konto</string>
<string name="account_link_export_info">För att använda detta konto på en annan enhet, måste du först exponera det på Ring. Detta genererar en PIN-kod som du måste ange på den nya enheten för att öppna kontot. Pin-koden är giltig i 10 minuter.\n\nAnge ditt lösenord för att starta:</string>
@@ -158,10 +147,6 @@ Du kan ändra kontot senare.</string>
<string name="account_end_export_button">stäng</string>
<string name="account_end_export_infos">Din PIN-kod är:\n\n%%\n\nFör att slutföra åtgärden, måste du nu öppna Ring på den nya enheten. Skapa ett nytt konto med \"Koppla den här enheten till ett konto\". PIN-koden är giltig i 10 minuter.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Kan inte registrera namnet. Fel kontolösenord.</string>
- <string name="register_name_invalid">Kan inte registrera namnet. Ogiltigt namn.</string>
- <string name="register_name_already_taken">Kan inte registrera namnet. Namnet finns redan.</string>
- <string name="register_name_network_error">Kan inte registrera namnet. Nätverks- eller serverfel.</string>
<string name="error_username_empty">Ange ett användarnamn</string>
<string name="no_registered_name_for_account">Inget registrerat namn hittades för detta konto</string>
<string name="register_name">Registrera namn</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_call.xml b/ring-android/app/src/main/res/values-sv/strings_call.xml
index 8faf4171f5ffcd06d1756dd35f5697fde634b293..3c6fabcd3364a1224631a89b0e6797cb3dbda479 100644
--- a/ring-android/app/src/main/res/values-sv/strings_call.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_call.xml
@@ -33,7 +33,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_unhold">Återuppta</string>
<string name="call_human_state_over">Över</string>
<string name="call_human_state_none">Ingen</string>
- <string name="conference_human_state_hold">Parkera</string>
- <string name="conference_human_state_hold_rec">Parkera insp.</string>
- <string name="conference_human_state_default">Ingen</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 2aa6f3c66be2ac42c9425229aa914594a8a35823..ba505be5015be9ae76abf8c35a736ea21f2c21bf 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -22,7 +22,6 @@
<string name="error_no_network">Ağ bağlantısı yok</string>
<string name="error_mobile_network_available_but_disabled">Lütfen ayarlar ekranında hücre ağına erişim verin.</string>
<!--AB menus-->
- <string name="ab_account_creation">Yeni hesap</string>
<string name="ab_action_chat">Metin ileti</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -34,31 +33,21 @@
<string name="menu_item_accounts">Hesapları yönet</string>
<string name="menu_item_settings">Ayarlar</string>
<string name="menu_item_share">Bilgimi paylaş</string>
- <string name="menu_item_blacklist">Engellenmiş kişiler</string>
<string name="menu_item_about">Ring Hakkında</string>
<!--Dialing Fragment-->
<string name="dial_number">Bir numara çevir</string>
<!--History Fragment-->
- <string name="hist_replay_button">Yeniden oynat</string>
- <string name="hist_replay_button_stop">Durdur</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Konuşma</item>
<item quantity="other">%d Konuşma</item>
</plurals>
- <string name="home_transfering">%1$s den %2$s ye aktarılıyor</string>
- <string name="home_transfer_complet">Aktarım tamamlandı</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Kişi bulunamadı</string>
- <string name="starred_contacts_title">Sık Kullanılanlar</string>
<string name="searchbar_hint">Ad ya da telefon numarası girin...</string>
<string name="choose_number">Numara seçin</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Başka bir geçerli aramaya aktar:</string>
- <string name="transfer_no_other_call">Bekleyen başka arama yok</string>
- <string name="transfer_type_number">Aktarılacak numarayı girin:</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">Yanıtsız gelen arama</string>
<string name="notif_missed_outgoing_call">Yanıtsız giden arama</string>
@@ -70,8 +59,6 @@
<string name="notif_current_call">Şimdiki arama</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Sen:</string>
- <string name="action_call_attended_transfer">Katılınmış Aktarma</string>
- <string name="action_call_conference">Toplantı</string>
<string name="action_call_hangup">Kapat</string>
<string name="ongoing_call">Giden arama</string>
<string name="hist_in_call">%1$s gelen arama</string>
@@ -94,7 +81,6 @@
<string name="send_message">İleti gönder</string>
<string name="message_sending">İleti gönderiliyor...</string>
<string name="time_just_now">Şimdi</string>
- <string name="permission_read_denied">Uygulamaya deponuzu okuma izni verilmedi. Bu yüzden düzgün işleyemez. Lütfen bu izni vermeyi göz ardı etmeyin.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamera izni</string>
<string name="permission_dialog_camera_message">Görüntülü görüşmelerin çalışması için kamera izni gerekir. Lütfen etkinleştirmeyi göz ardı etmeyin.</string>
@@ -136,7 +122,6 @@
<string name="open_the_gallery">Galeriyi aç</string>
<string name="take_a_photo">Fotoğraf çek</string>
<string name="profile_name_hint">Adınızı girin (isteğe bağlı)</string>
- <string name="unknown">Bilinmeyen</string>
<!--Share fragment-->
<string name="share_message">Sizinle iletişime geçmek isteyenin Ring uygulamasının gömülü tarayıcısıyla bu QR kodu tarayın.</string>
<string name="share_message_no_account">Lütfen paylaşmak için bir hesap seçin.</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index 0824a7d4bf8c5f3cd63bce4e167d54baaacc17be..7db13fefe3487570076e00c5e873e32af4b188c1 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -103,16 +103,9 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
<string name="account_rtp_min_port">Asgari</string>
<string name="account_rtp_port_range">Ses RTP Delik Aralığı</string>
<!--restore/backup-->
- <string name="account_restore_account">Hesabı geri yükle</string>
- <string name="account_restore_message">Dosya şifresini çözmek için parolayı girin.</string>
- <string name="account_restore_decryption_password">Şifre çözme parolası</string>
<string name="account_new_device_password">Hesabın kilidini açmak için ana parolayı gir</string>
- <string name="restore_dialog_title">Geri yükleniyor</string>
- <string name="restore_backup_wait">Lütfen bekleyin...</string>
<string name="error_password_char_count">En az 6 karakter</string>
<string name="error_passwords_not_equals">Parolalar eşleşmedi</string>
- <string name="restore_failed_dialog_title">Geri yükleme başarısız</string>
- <string name="restore_failed_dialog_msg">Bir hata oluştu</string>
<string name="export_account_wait_title">Lütfen bekleyin...</string>
<string name="export_account_wait_message">Yeni hesap bilgisi yayımlanıyor</string>
<string name="account_export_end_decryption_message">Sağlanan parola kullanılarak hesabınızın kilidi açılamıyor.</string>
@@ -131,8 +124,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
<string name="account_migration_title_dialog">Hesap taşıma</string>
<string name="account_migration_message_dialog">Hesaplarınızın güncellenmesi gerekli.Hesap yönetim ekranından bu süreci yürütmek ister misiniz?</string>
<string name="account_update_needed">Güncelleme gerekli</string>
- <string name="account_creation_file_too_big">Dosya çok büyük</string>
- <string name="account_cannot_read">%1$s okunamıyor</string>
<string name="account_cannot_be_found_title">Hesap bulunamadı</string>
<string name="account_cannot_be_found_message">Hesap Ring ağı üzerinde bulunamadı.\nVar olan bir aygıttan Ring üzerinde dışa aktarıldığından ve sağladığı bilgilerin doğru olduğundan emin olun.</string>
<string name="account_sip_cannot_be_registered_message">Hesap oluşturma süreciyle devam edebilir ya da bilginizi burada düzenleyebilirsiniz. Düzenleme daha sonra hesap ayarlarında yapılabilir.</string>
@@ -147,9 +138,7 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
<string name="account_sip_success_message">Sip hesabınızı başarıyla kaydettiniz.</string>
<string name="account_sip_register_anyway">Her koşulda kaydol</string>
<string name="account_link_button">Bu aygıtı bir hesaba bağla</string>
- <string name="account_import_title">Var olan bir hesaba bağla</string>
<string name="account_link_prompt_pin">PIN\'i gir</string>
- <string name="account_wizard_title">Hoş geldiniz</string>
<string name="account_new_button">Bir Ring hesabı oluştur</string>
<string name="account_link_export_button">Başka aygıtı bu hesaba bağla</string>
<string name="account_link_export_info">Bu hesabı başka aygıtlarda kullanmak için ilk olarak Ring\'de açığa çıkarmalısınız. Bu, hesabı kurmak için yeni aygıtta girmeniz gereken bir PIN kodu oluşturacak. PIN 10 dakikalığıa geçerlidir.\n\nLütfen başlamak için parolanızı sağlayın:</string>
@@ -157,10 +146,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
<string name="account_end_export_button">kapat</string>
<string name="account_end_export_infos">Pin\'iniz:\n\n%%\n\nSüreci tamamlamak için yeni aygıtta Ring\'i açmanız gerekiyor. \"Bu aygıtı bir hesaba bağla\" ile yeni hesap oluşturun. Pin\'iniz 10 dakikalığına geçerlidir.</string>
<!--Name registration-->
- <string name="register_name_wrong_password">Ad kaydedilemiyor: yanlış hesap parolası.</string>
- <string name="register_name_invalid">Ad kaydedilemiyor: geçersiz ad.</string>
- <string name="register_name_already_taken">Ad kaydedilemiyor: ad önceden alınmış.</string>
- <string name="register_name_network_error">Ad kaydedilemiyor: ağ ya da sunucu hatası.</string>
<string name="error_username_empty">Bir kullanıcı adı gir</string>
<string name="no_registered_name_for_account">Bu hesap için kaydedilmiş ad bulunamadı</string>
<string name="register_name">Adı kaydet</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings_call.xml b/ring-android/app/src/main/res/values-tr/strings_call.xml
index 63661d1b72fa428e412f61768eef61a723ebc5d4..462af6810460c4a4f7e7fea51c7e854f520eee3c 100644
--- a/ring-android/app/src/main/res/values-tr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Bitti</string>
<string name="call_human_state_none">Hiçbiri</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Eklenmiş etkin</string>
- <string name="conference_human_state_active_detached">Ayrılmış etkin</string>
- <string name="conference_human_state_active_attached_rec">Eklenmiş kayıt etkin</string>
- <string name="conference_human_state_active_detached_rec">Ayrılmış kayıt etkin</string>
- <string name="conference_human_state_hold">Beklet</string>
- <string name="conference_human_state_hold_rec">Kayda ara ver</string>
- <string name="conference_human_state_default">Hiçbiri</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index aabdbab04d1f7e1dc52fe99cbe33a5110cf4c526..f7cf602369b00a9772c7b9b44a5eebce33b05c8d 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -14,7 +14,6 @@
<string name="error_no_network">Відсутнє з’єднання з мережею</string>
<string name="error_mobile_network_available_but_disabled">Будь ласка надайте права доступу для стільникової мережі у меню налаштувань.</string>
<!--AB menus-->
- <string name="ab_account_creation">Новий аккаунт</string>
<string name="ab_action_chat">Текстова переписка</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -28,8 +27,6 @@
<!--Dialing Fragment-->
<string name="dial_number">Набрати номер</string>
<!--History Fragment-->
- <string name="hist_replay_button">Повторити</string>
- <string name="hist_replay_button_stop">Стоп</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
@@ -37,17 +34,11 @@
<item quantity="few">%d групових чатів</item>
<item quantity="other">%d групові чати</item>
</plurals>
- <string name="home_transfer_complet">Відправлення закінчено</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">Контакт не знайдено</string>
- <string name="starred_contacts_title">Улюблені</string>
<string name="searchbar_hint">Введіть ім’я або телефонний номер...</string>
<string name="choose_number">Оберіть номер</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">Перейти до іншого активного виклику</string>
- <string name="transfer_no_other_call">Немає викликів, які очікуть</string>
- <string name="transfer_type_number">Введіть номер отримувача:</string>
<!--Notifications-->
<string name="notif_incoming_call_title">Вхідний виклик від %1$s</string>
<string name="notif_incoming_call">Вхідний виклик</string>
@@ -57,8 +48,6 @@
<string name="notif_current_call">Діючий виклик</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Ви:</string>
- <string name="action_call_attended_transfer">Прийняті обміни</string>
- <string name="action_call_conference">Конференція</string>
<string name="action_call_hangup">Скинути</string>
<string name="ongoing_call">Поточний дзвінок</string>
<string name="hist_in_call">Вхідний виклик тривалістю %1$s</string>
@@ -80,7 +69,6 @@
<string name="send_message">Відправити повідомлення</string>
<string name="message_sending">ВІдправка повідомлення</string>
<string name="time_just_now">Прямо зараз</string>
- <string name="permission_read_denied">Додатоку не було дозволено зчитувати фали з вашого пристрою. Отже, він не може функціонувати належним чином. Будь ласка, розгляньте питання про надання йому такого дозволу</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Дозволи для камери</string>
<string name="permission_dialog_camera_message">Для здійснення відерозмови необхідно надати дозвіл на роботу камери. Будь ласка, розглянути можливість її увімкнення.</string>
@@ -108,7 +96,6 @@
<string name="account_create_title">Створити обліковий запис Ring</string>
<string name="wizard_next">Наступний</string>
<!--MenuHeaderView-->
- <string name="unknown">Невідомий</string>
<!--Share fragment-->
<string name="generic_error_migration">Помилка</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/ring-android/app/src/main/res/values-uk/strings_account.xml
index 2699ac8d27b65c41d8215642a7c16c5bcc347f64..19052541b72458b5c10cf8fc1aa39ddcc4f3db0c 100644
--- a/ring-android/app/src/main/res/values-uk/strings_account.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_account.xml
@@ -84,12 +84,8 @@
<string name="account_rtp_min_port">Мінімум</string>
<string name="account_rtp_port_range">Порти для передачі аудіо по RTP</string>
<!--restore/backup-->
- <string name="account_restore_message">Введіть пароль для розшифрування файлу.</string>
- <string name="account_restore_decryption_password">Розшифрування паролю</string>
- <string name="restore_backup_wait">Будь ласка зачекайте</string>
<string name="error_password_char_count">мінімум 6 символів</string>
<string name="error_passwords_not_equals">Паролі не збігаються</string>
- <string name="restore_failed_dialog_msg">Виникла помилка</string>
<string name="export_account_wait_title">Будь ласка зачекайте</string>
<string name="account_export_end_error_title">Помилка</string>
<string name="account_new_button">Створити обліковий запис Ring</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings_call.xml b/ring-android/app/src/main/res/values-uk/strings_call.xml
index 2fe87321ef2f3873d77adaad89222d25397ac882..94810db54b19431abc92fdc643752db0f5336316 100644
--- a/ring-android/app/src/main/res/values-uk/strings_call.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Понад</string>
<string name="call_human_state_none">Нічого</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Активний приєднаний</string>
- <string name="conference_human_state_active_detached">Активний від\'єднаний</string>
- <string name="conference_human_state_active_attached_rec">Активний приєднаний запис</string>
- <string name="conference_human_state_active_detached_rec">Активний від\'єднаний запис</string>
- <string name="conference_human_state_hold">Режим очікування</string>
- <string name="conference_human_state_hold_rec">Утримання запис</string>
- <string name="conference_human_state_default">Нічого</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 4cca7075a76f79d28f8dfc6301464551f74bc1a4..3cda5112cc1a645f8aaff9db1673a3410e0a76d8 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -21,7 +21,6 @@
<string name="error_no_network">无网络连接</string>
<string name="error_mobile_network_available_but_disabled">请前往“设置”界面开启移动数据使用权限。</string>
<!--AB menus-->
- <string name="ab_account_creation">新账户</string>
<string name="ab_action_chat">文字消息</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -33,30 +32,20 @@
<string name="menu_item_accounts">管理帐户</string>
<string name="menu_item_settings">设置</string>
<string name="menu_item_share">共享我的通讯录</string>
- <string name="menu_item_blacklist">已屏蔽的联系人</string>
<string name="menu_item_about">关于Ring</string>
<!--Dialing Fragment-->
<string name="dial_number">拨号</string>
<!--History Fragment-->
- <string name="hist_replay_button">重放</string>
- <string name="hist_replay_button_stop">停止</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="other">%d个会话</item>
</plurals>
- <string name="home_transfering">正在传输从%1$s到%2$s</string>
- <string name="home_transfer_complet">传输完成</string>
<!--ContactList Fragment-->
- <string name="no_contact_found">未找到联系人</string>
- <string name="starred_contacts_title">收藏夹</string>
<string name="searchbar_hint">输入姓名或电话号码…</string>
<string name="choose_number">选择一个数字</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
- <string name="transfer_to_another_call">切换至另一个当前通话</string>
- <string name="transfer_no_other_call">无通话</string>
- <string name="transfer_type_number">输入要切换至的号码：</string>
<!--Notifications-->
<string name="notif_missed_incoming_call">未接来电</string>
<string name="notif_incoming_call_title">来电：%1$s</string>
@@ -67,8 +56,6 @@
<string name="notif_current_call">当前通话</string>
<!--Call Fragment-->
<string name="you_txt_prefix">你：</string>
- <string name="action_call_attended_transfer">转接</string>
- <string name="action_call_conference">会议</string>
<string name="action_call_hangup">挂断</string>
<string name="ongoing_call">正在通话</string>
<string name="hist_in_call">来电：%1$s</string>
@@ -91,7 +78,6 @@
<string name="send_message">发消息</string>
<string name="message_sending">正在发送消息…</string>
<string name="time_just_now">刚才</string>
- <string name="permission_read_denied">该应用程序无法读取您的手机存储，无法正常工作。请设置相应权限。</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">摄像头使用权限</string>
<string name="permission_dialog_camera_message">视频会话需要使用摄像头，请设置相应权限。</string>
@@ -133,7 +119,6 @@
<string name="open_the_gallery">打开照片库</string>
<string name="take_a_photo">拍照</string>
<string name="profile_name_hint">输入您的名字（可选）</string>
- <string name="unknown">未知</string>
<!--Share fragment-->
<string name="share_message">使用Ring扫描此二维码以建立连接。</string>
<string name="share_message_no_account">请选择要共享的帐户。</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index beaa4e57c205fa2912072598577a0ec13dd50152..516154025f4852eecad2b32afd0b6effc7224801 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -104,16 +104,9 @@
<string name="account_rtp_min_port">最小</string>
<string name="account_rtp_port_range">音频RTP端口范围</string>
<!--restore/backup-->
- <string name="account_restore_account">恢复帐户</string>
- <string name="account_restore_message">请输入密码以解密该文件。</string>
- <string name="account_restore_decryption_password">解密密码</string>
<string name="account_new_device_password">输入主密码以解锁帐户</string>
- <string name="restore_dialog_title">正在恢复</string>
- <string name="restore_backup_wait">请稍等…</string>
<string name="error_password_char_count">最少6字符</string>
<string name="error_passwords_not_equals">密码不匹配</string>
- <string name="restore_failed_dialog_title">恢复失败</string>
- <string name="restore_failed_dialog_msg">发生错误</string>
<string name="export_account_wait_title">请稍等…</string>
<string name="export_account_wait_message">提交新帐户信息</string>
<string name="account_export_end_decryption_message">使用该密码无法解锁您的帐户。</string>
@@ -132,8 +125,6 @@
<string name="account_migration_title_dialog">帐户迁移</string>
<string name="account_migration_message_dialog">您的帐户需要被更新。您想前往帐户管理界面进行该操作吗？</string>
<string name="account_update_needed">需要更新</string>
- <string name="account_creation_file_too_big">文件过大</string>
- <string name="account_cannot_read">无法读取%1$s</string>
<string name="account_cannot_be_found_title">无法找到帐户</string>
<string name="account_cannot_be_found_message">无法在Ring网络中找到帐户。\n请确认该帐户已从其他设备中导出，并且您提供了正确的认证信息。</string>
<string name="account_sip_cannot_be_registered_message">您可以前往下一步或在这里编辑您的信息。帐户创建后，您仍可在帐户设置中进行编辑。</string>
@@ -148,9 +139,7 @@
<string name="account_sip_success_message">您已成功注册了您的SIP帐户。</string>
<string name="account_sip_register_anyway">仍然注册</string>
<string name="account_link_button">将此设备与一个帐户进行连接</string>
- <string name="account_import_title">与已有帐户进行连接</string>
<string name="account_link_prompt_pin">输入PIN</string>
- <string name="account_wizard_title">欢迎来到</string>
<string name="account_new_button">创建Ring帐户</string>
<string name="account_link_export_button">将另一设备与该帐户进行连接</string>
<string name="account_link_export_info">要在其他设备上使用该帐户，您需要将其连接至Ring，在此过程中您会得到一个PIN，在10分钟内有效。请将其输入您的新设备以设置该帐户。\n\n首先，请输入您的密码：</string>
@@ -158,10 +147,6 @@
<string name="account_end_export_button">关闭</string>
<string name="account_end_export_infos">您的PIN是：\n\n%%\n\n要继续，请在新设备上打开Ring，点击“将此设备与一个帐户进行连接”。您的PIN将在10分钟内有效。</string>
<!--Name registration-->
- <string name="register_name_wrong_password">无法注册用户名：帐户密码错误。</string>
- <string name="register_name_invalid">无法注册用户名：该用户名非法。</string>
- <string name="register_name_already_taken">无法注册用户名：该名称已被占用。</string>
- <string name="register_name_network_error">无法注册用户名：网络或服务器错误。</string>
<string name="error_username_empty">输入用户名</string>
<string name="no_registered_name_for_account">该帐户尚未注册用户名</string>
<string name="register_name">注册名称</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
index addfd000af8d6a0a1ef56d8e214824e301892506..0f62cfc34a975711f268bec2880120736b69c279 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">已结束</string>
<string name="call_human_state_none">无</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">已连接并在线</string>
- <string name="conference_human_state_active_detached">已连接但离开</string>
- <string name="conference_human_state_active_attached_rec">已连接并在线，录音</string>
- <string name="conference_human_state_active_detached_rec">已连接但离开，录音</string>
- <string name="conference_human_state_hold">等待</string>
- <string name="conference_human_state_hold_rec">暂停录音</string>
- <string name="conference_human_state_default">无</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index ce1003f9af5333cca3763f23d9f5f66cf824f5a9..19ada62da74b0f200c636eba0398b6546afb3d0e 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -12,7 +12,6 @@
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">沒有網路連接</string>
<!--AB menus-->
- <string name="ab_account_creation">新增帳號</string>
<string name="ab_action_chat">文字訊息</string>
<!--Left Drawer-->
<!--Accessibility-->
@@ -24,15 +23,12 @@
<!--Dialing Fragment-->
<string name="dial_number">播打一個號碼</string>
<!--History Fragment-->
- <string name="hist_replay_button_stop">停止</string>
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="other">%d 個對話</item>
</plurals>
<!--ContactList Fragment-->
- <string name="no_contact_found">沒有找到聯絡人</string>
- <string name="starred_contacts_title">我的最愛</string>
<string name="searchbar_hint">輸入名稱或電話號碼</string>
<string name="choose_number">選擇號碼</string>
<!--FileExplorerDFragement-->
@@ -46,7 +42,6 @@
<string name="notif_current_call">目前通話</string>
<!--Call Fragment-->
<string name="you_txt_prefix">你：</string>
- <string name="action_call_conference">會議</string>
<string name="action_call_hangup">掛斷</string>
<string name="start_error_title">無法啟動 Ring ！</string>
<string name="action_call_decline">拒絕</string>
@@ -83,7 +78,6 @@
<string name="prompt_new_password">新密碼</string>
<string name="account_create_title">建立一個 Ring 帳號</string>
<!--MenuHeaderView-->
- <string name="unknown">未知</string>
<!--Share fragment-->
<string name="generic_error_migration">錯誤</string>
<!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
index d95f3b6259e2275b66a480fe2db30650eb2316b5..72697deb210e34a457388a2bd31ac8700aeaaf94 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -62,15 +62,8 @@
<string name="account_rtp_min_port">最小值</string>
<string name="account_rtp_port_range">音訊 RTP 連接埠範圍</string>
<!--restore/backup-->
- <string name="account_restore_account">還原帳號</string>
- <string name="account_restore_message">輸入密碼來解密檔案。</string>
- <string name="account_restore_decryption_password">解密密碼</string>
- <string name="restore_dialog_title">還原中...</string>
- <string name="restore_backup_wait">請等待...</string>
<string name="error_password_char_count">最小6個字元</string>
<string name="error_passwords_not_equals">密碼不相符</string>
- <string name="restore_failed_dialog_title">還原失敗</string>
- <string name="restore_failed_dialog_msg">發生錯誤</string>
<string name="export_account_wait_title">請等待...</string>
<string name="account_export_end_network_title">網路錯誤</string>
<string name="account_export_end_error_title">錯誤</string>
@@ -78,13 +71,10 @@
<string name="update_account">更新帳號</string>
<string name="ring_account">Ring 帳號</string>
<string name="account_update_needed">需要更新</string>
- <string name="account_creation_file_too_big">檔案太大</string>
- <string name="account_cannot_read">無法讀取 %1$s</string>
<string name="account_cannot_be_found_title">找不到帳號</string>
<string name="account_no_network_title">無法連接到網路</string>
<string name="account_device_added_message">你已經在這個裝置上成功設定你的 Ring 帳號。</string>
<string name="account_link_button">連結這個裝置到一個帳號</string>
- <string name="account_import_title">連結到一個已存在的帳號</string>
<string name="account_new_button">建立一個 Ring 帳號</string>
<string name="account_end_export_button">關閉</string>
<!--Name registration-->
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
index 1bdc9042a747bab7378441706978f44f3fb78a8c..2f3ccc35667770a488a1ef93c45fe6bc8a15531a 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
@@ -30,5 +30,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_failure">失敗</string>
<string name="call_human_state_over">結束</string>
<string name="call_human_state_none">無</string>
- <string name="conference_human_state_default">無</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index d16bd274f877589379feed4ae086d911457b8dc9..0081881c1fa9e6ee6ebafcd83ee97837be3bb4db 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -32,7 +32,6 @@
<!--Contacts-->
<string name="wizard_next">下一步</string>
<!--MenuHeaderView-->
- <string name="unknown">未知</string>
<!--Share fragment-->
<!--Pending contact requests-->
<string name="refuse">拒絕</string>
diff --git a/ring-android/app/src/main/res/values-zh/strings_call.xml b/ring-android/app/src/main/res/values-zh/strings_call.xml
index 4632fed55f6a59c41025839ea36483e44a2ea9ea..41b8f06dda71fa58166101f5595d156d9050b465 100644
--- a/ring-android/app/src/main/res/values-zh/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_call.xml
@@ -23,5 +23,4 @@ along with this program; if not, write to the Free Software
<resources>
<string name="call_human_state_ringing">撥打</string>
<string name="call_human_state_hold">保持通話</string>
- <string name="conference_human_state_hold">保持通話</string>
- </resources>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/arrays.xml b/ring-android/app/src/main/res/values/arrays.xml
index 25277800c029d126e1b823c859f6191e98fe754c..6ab549130ab529e2273502b7a48af224066ae4ad 100644
--- a/ring-android/app/src/main/res/values/arrays.xml
+++ b/ring-android/app/src/main/res/values/arrays.xml
@@ -20,11 +20,6 @@ along with this program; if not, write to the Free Software
-->
<resources>
- <string-array name="drop_actions">
- <item>@string/action_call_attended_transfer</item>
- <item>@string/action_call_conference</item>
- </string-array>
-
<string-array name="conversation_actions">
<item>@string/conversation_action_copy_peer_number</item>
<item>@string/conversation_action_delete_this</item>
diff --git a/ring-android/app/src/main/res/values/colors.xml b/ring-android/app/src/main/res/values/colors.xml
index f9fae11326f334a8c77d06e3cf84edbb8ffc5522..f8cbfba97b95a8c3768867253d177f59cb566c9c 100644
--- a/ring-android/app/src/main/res/values/colors.xml
+++ b/ring-android/app/src/main/res/values/colors.xml
@@ -7,7 +7,6 @@
<color name="action_blue">#004C60</color>
<!-- SFL colors-->
- <color name="sfl_blue_lines">#0a90ce</color>
<color name="darker_gray">#aaaaaa</color>
<color name="light">#eee</color>
@@ -18,30 +17,21 @@
<color name="error_pane">#e57373</color>
- <color name="background_tab_pressed">#6633b5e5</color>
-
<color name="transparent_light">#AAFFFFFF</color>
<!-- A light Holo shade of blue -->
- <color name="holo_blue_light">#ff33b5e5</color>
<!-- A light Holo shade of green -->
- <color name="holo_green_light">#ff99cc00</color>
<!-- A light Holo shade of red -->
<color name="holo_red_light">#ffff4444</color>
<!-- A dark Holo shade of blue -->
- <color name="holo_blue_dark">#ff0099cc</color>
<!-- A dark Holo shade of green -->
<color name="holo_green_dark">#ff669900</color>
<!-- A dark Holo shade of red -->
<color name="holo_red_dark">#ffcc0000</color>
<!-- A Holo shade of purple -->
- <color name="holo_purple">#ffaa66cc</color>
<!-- A light Holo shade of orange -->
- <color name="holo_orange_light">#ffffbb33</color>
<!-- A dark Holo shade of orange -->
- <color name="holo_orange_dark">#ffff8800</color>
<!-- A really bright Holo shade of blue -->
- <color name="holo_blue_bright">#ff00ddff</color>
<color name="transparent_grey">#AACCCCCC</color>
<color name="transparent_dark_grey">#88424242</color>
diff --git a/ring-android/app/src/main/res/values/dimens.xml b/ring-android/app/src/main/res/values/dimens.xml
index 985e0f1031825253438d7c536b1c454ab418602d..91b1a96fdd033b852e03aa718d3f5eb40ec43af9 100644
--- a/ring-android/app/src/main/res/values/dimens.xml
+++ b/ring-android/app/src/main/res/values/dimens.xml
@@ -27,10 +27,6 @@ along with this program; if not, write to the Free Software
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
- <dimen name="contact_vertical_spacing">16dp</dimen>
-
- <dimen name="header_history_detail">200dp</dimen>
-
<dimen name="action_button_lpadding">0dp</dimen>
<dimen name="action_button_bpadding">-45dp</dimen>
<dimen name="fab_compat_margin">0dp</dimen>
diff --git a/ring-android/app/src/main/res/values/ids.xml b/ring-android/app/src/main/res/values/ids.xml
index 0224e03bc7dd4f566331a9959922a7b96723c4ff..abebaf4bf63a048ca27fa0aa31974a5e2a67d5d8 100644
--- a/ring-android/app/src/main/res/values/ids.xml
+++ b/ring-android/app/src/main/res/values/ids.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="id" name="drag_handle" />
- <item type="id" name="click_remove" />
</resources>
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index 872299d1d82915f6d63c979049ec436b3bf1f696..a140fdf5cc361a4fe9e749d39c70cae308947fdc 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -57,7 +57,6 @@ along with this program; if not, write to the Free Software
<string name="error_mobile_network_available_but_disabled">Please grant access to cellular network in the settings screen.</string>
<!-- AB menus -->
- <string name="ab_account_creation">New account</string>
<string name="ab_action_chat">Text messaging</string>
<!-- Left Drawer -->
@@ -70,15 +69,12 @@ along with this program; if not, write to the Free Software
<string name="menu_item_accounts">Manage accounts</string>
<string name="menu_item_settings">Settings</string>
<string name="menu_item_share">Share my contact</string>
- <string name="menu_item_blacklist">Blocked contacts</string>
<string name="menu_item_about">About Ring</string>
<!-- Dialing Fragment -->
<string name="dial_number">Dial a number</string>
<!-- History Fragment -->
- <string name="hist_replay_button">Replay</string>
- <string name="hist_replay_button_stop">Stop</string>
<!-- DetailsHistory Fragment -->
@@ -88,21 +84,14 @@ along with this program; if not, write to the Free Software
<item quantity="one">%d Conversation</item>
<item quantity="other">%d Conversations</item>
</plurals>
- <string name="home_transfering">Transferring %1$s to %2$s</string>
- <string name="home_transfer_complet">Transfer complete</string>
<!-- ContactList Fragment -->
- <string name="no_contact_found">No contact found</string>
- <string name="starred_contacts_title">Favorites</string>
<string name="searchbar_hint">Enter name or phone number…</string>
<string name="choose_number">Choose a number</string>
<!-- FileExplorerDFragement -->
<!-- TransferDFragment -->
- <string name="transfer_to_another_call">Transfer to another current call:</string>
- <string name="transfer_no_other_call">No other calls pending</string>
- <string name="transfer_type_number">Type number to transfer to:</string>
<!-- Notifications -->
<string name="notif_missed_incoming_call">Missed incoming call</string>
@@ -116,8 +105,6 @@ along with this program; if not, write to the Free Software
<!-- Call Fragment -->
<string name="you_txt_prefix">You:</string>
- <string name="action_call_attended_transfer">Attended Transfer</string>
- <string name="action_call_conference">Conference</string>
<string name="action_call_hangup">Hang up</string>
<string name="ongoing_call">Ongoing call</string>
<string name="hist_in_call">Incoming call of %1$s</string>
@@ -141,7 +128,6 @@ along with this program; if not, write to the Free Software
<string name="send_message">Send message</string>
<string name="message_sending">Sending message…</string>
<string name="time_just_now">Just now</string>
- <string name="permission_read_denied">The app was not allowed to read to your storage. Hence, it cannot function properly. Please consider granting it this permission</string>
<!-- MediaPreferenceFragment -->
<string name="permission_dialog_camera_title">Camera permission</string>
@@ -191,7 +177,6 @@ along with this program; if not, write to the Free Software
<string name="open_the_gallery">Open the gallery</string>
<string name="take_a_photo">Take a photo</string>
<string name="profile_name_hint">Enter your name (optional)</string>
- <string name="unknown">Unknown</string>
<!-- Share fragment -->
<string name="share_message">Scan this QRCode with the embedded scanner of the Ring application that wants to communicate with you.</string>
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index 01e5e42b9b81f714f43c808f34c43bf74b1c7d7b..0c754aaec6b2f76af88e6b48cc752aa613303728 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -143,17 +143,10 @@ along with this program; if not, write to the Free Software
<string name="account_rtp_port_range">Audio RTP Port Range</string>
<!-- restore/backup -->
- <string name="account_restore_account">Restore an account</string>
- <string name="account_restore_message">Enter password to decrypt the file.</string>
- <string name="account_restore_decryption_password">Decryption password</string>
<string name="account_new_device_password">Enter main password to unlock account</string>
- <string name="restore_dialog_title">Restoring</string>
- <string name="restore_backup_wait">Please wait…</string>
<string name="error_password_char_count">6 characters minimum</string>
<string name="error_passwords_not_equals">Passwords do not match</string>
- <string name="restore_failed_dialog_title">Restore failed</string>
- <string name="restore_failed_dialog_msg">An error occurred</string>
<string name="export_account_wait_title">Please wait…</string>
<string name="export_account_wait_message">Publishing new account information</string>
<string name="account_export_end_decryption_message">Couldn\'t unlock your account using the provided password.</string>
@@ -172,8 +165,6 @@ along with this program; if not, write to the Free Software
<string name="account_migration_title_dialog">Account migration</string>
<string name="account_migration_message_dialog">Your accounts need to be updated. Do you want to go the Account management screen to perform this operation ?</string>
<string name="account_update_needed">Update needed</string>
- <string name="account_creation_file_too_big">File is too big</string>
- <string name="account_cannot_read">Can\'t read %1$s</string>
<string name="account_cannot_be_found_title">Can\'t find account</string>
<string name="account_cannot_be_found_message">Account couldn\'t be found on the Ring network.\nMake sure it was exported on Ring from an existing device, and that provided credentials are correct.</string>
<string name="account_sip_cannot_be_registered_message">You can continue with the account creation process or edit your information here. Edition is still possible later in the account settings.</string>
@@ -189,9 +180,7 @@ along with this program; if not, write to the Free Software
<string name="account_sip_register_anyway">Register anyway</string>
<string name="account_link_button">Link this device to an account</string>
- <string name="account_import_title">Link to an existing account</string>
<string name="account_link_prompt_pin">Enter PIN</string>
- <string name="account_wizard_title">Welcome to </string>
<string name="account_new_button">Create a Ring account</string>
<string name="account_link_export_button">Link another device to this account</string>
<string name="account_link_export_info">To use this account on other devices, you must first expose it on Ring. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes. \n\nPlease provide your password to start:</string>
@@ -200,10 +189,6 @@ along with this program; if not, write to the Free Software
<string name="account_end_export_infos">Your Pin is:\n\n%%\n\nTo complete the process, you need to open Ring on the new device. Create a new account with \"Link this device to an account\". Your pin is valid for 10 minutes.</string>
<!-- Name registration -->
- <string name="register_name_wrong_password">Can\'t register name: wrong account password.</string>
- <string name="register_name_invalid">Can\'t register name: invalid name.</string>
- <string name="register_name_already_taken">Can\'t register name: name already taken.</string>
- <string name="register_name_network_error">Can\'t register name: network or server error.</string>
<string name="error_username_empty">Enter a username</string>
<string name="no_registered_name_for_account">No registered name found for this account</string>
<string name="register_name">Register name</string>
diff --git a/ring-android/app/src/main/res/values/strings_call.xml b/ring-android/app/src/main/res/values/strings_call.xml
index e16a75a27718d095de8ffe900f36dc80aec50e78..73b0225ddf208dd7a48500bd070d4711ecd8ed13 100644
--- a/ring-android/app/src/main/res/values/strings_call.xml
+++ b/ring-android/app/src/main/res/values/strings_call.xml
@@ -34,11 +34,4 @@ along with this program; if not, write to the Free Software
<string name="call_human_state_over">Over</string>
<string name="call_human_state_none">None</string>
<!-- Conferences -->
- <string name="conference_human_state_active_attached">Active attached</string>
- <string name="conference_human_state_active_detached">Active detached</string>
- <string name="conference_human_state_active_attached_rec">Active attached rec</string>
- <string name="conference_human_state_active_detached_rec">Active detached rec</string>
- <string name="conference_human_state_hold">Hold</string>
- <string name="conference_human_state_hold_rec">Hold rec</string>
- <string name="conference_human_state_default">None</string>
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/xml/account_advanced_prefs.xml b/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
index 6acd5bd14103697658ab86c02afbcc6b3d5f8928..66f21a56be26e22134011f586a5d158adb5ee92c 100644
--- a/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
@@ -20,38 +20,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_dhtpublicincalls"
android:defaultValue="false"
android:key="DHT.PublicInCalls"
android:persistent="false"
android:title="@string/account_dht_public_in_calls_label" />
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_registration_expire"
android:defaultValue="60"
android:key="Account.registrationExpire"
android:persistent="false"
android:title="@string/account_registration_exp_label" />
<ListPreference
- android:id="@+id/account_local_interface"
android:key="Account.localInterface"
android:persistent="false"
android:title="@string/account_local_interface_label" />
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_local_port"
android:defaultValue="5060"
android:key="Account.localPort"
android:persistent="false"
android:title="@string/account_local_port_label" />
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_stun_category"
- android:title="@string/account_published_address_label">
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_published_address_label">
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_stun_enable"
android:key="STUN.enable"
android:persistent="false"
android:summaryOff="Disabled"
@@ -59,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_stun_enable_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_stun_server"
android:defaultValue=""
android:dependency="STUN.enable"
android:key="STUN.server"
@@ -68,7 +60,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_stun_server_label" />
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_turn_enable"
android:key="TURN.enable"
android:persistent="false"
android:summaryOff="Disabled"
@@ -76,7 +67,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_turn_enable_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_turn_server"
android:defaultValue=""
android:dependency="TURN.enable"
android:key="TURN.server"
@@ -85,7 +75,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_turn_server_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_turn_username"
android:defaultValue=""
android:dependency="TURN.enable"
android:key="TURN.username"
@@ -94,7 +83,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_turn_username_label" />
<cx.ring.views.PasswordPreference
- android:id="@+id/account_turn_password"
android:defaultValue=""
android:dependency="TURN.enable"
android:key="TURN.password"
@@ -103,14 +91,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_turn_password_label" />
<android.support.v7.preference.CheckBoxPreference
- android:id="@+id/account_published_sameas_local"
android:key="Account.publishedSameAsLocal"
android:disableDependentsState="true"
android:persistent="false"
android:title="@string/account_published_same_as_local_label" />
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_published_port"
android:defaultValue="5060"
android:dependency="Account.publishedSameAsLocal"
android:key="Account.publishedPort"
@@ -118,26 +104,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_published_port_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_published_address"
android:dependency="Account.publishedSameAsLocal"
android:key="Account.publishedAddress"
android:persistent="false"
android:title="@string/account_published_address_label" />
</android.support.v7.preference.PreferenceCategory>
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_rtp_port_range"
- android:title="@string/account_rtp_port_range">
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_rtp_port_range">
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_rtp_min_port"
android:defaultValue="0"
android:key="Account.audioPortMin"
android:persistent="false"
android:title="@string/account_rtp_min_port" />
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_rtp_max_port"
android:defaultValue="65535"
android:key="Account.audioPortMax"
android:persistent="false"
diff --git a/ring-android/app/src/main/res/xml/account_general_prefs.xml b/ring-android/app/src/main/res/xml/account_general_prefs.xml
index 9c49f891a7d53892e31c64e7ae3ade67938a5c0b..712123db7cb08267c2c8aef49cc1aba21e1b6efe 100644
--- a/ring-android/app/src/main/res/xml/account_general_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_general_prefs.xml
@@ -27,9 +27,7 @@ along with this program; if not, write to the Free Software
android:key="Account.status"
android:persistent="false" />
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_basic_category"
- android:title="@string/account_basic_category" >
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_basic_category" >
<android.support.v7.preference.EditTextPreference
android:id="@+id/account_alias"
android:key="Account.alias"
@@ -37,42 +35,34 @@ along with this program; if not, write to the Free Software
android:summary=""
android:title="@string/account_alias_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_hostname"
android:key="Account.hostname"
android:persistent="false"
android:summary=""
android:title="@string/account_hostname_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_username"
android:key="Account.username"
android:persistent="false"
android:summary=""
android:title="@string/account_username_label" />
<cx.ring.views.PasswordPreference
- android:id="@+id/account_password"
android:key="Account.password"
android:persistent="false"
android:summary=""
android:title="@string/account_password_label" />
</android.support.v7.preference.PreferenceCategory>
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_optionnal_category"
- android:title="@string/account_optionnal_category" >
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_optionnal_category" >
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_proxy"
android:defaultValue=""
android:key="Account.routeset"
android:persistent="false"
android:title="@string/account_proxy_field" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_useragent"
android:defaultValue=""
android:key="Account.useragent"
android:persistent="false"
android:title="@string/account_useragent_label" />
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_autoanswer"
android:defaultValue="false"
android:key="Account.autoAnswer"
android:persistent="false"
diff --git a/ring-android/app/src/main/res/xml/account_media_prefs.xml b/ring-android/app/src/main/res/xml/account_media_prefs.xml
index 051b17ced6e37b48d9ba70d4be80318cf020a785..8772bae509776e2ee3639dffe3f3754f92b6920c 100644
--- a/ring-android/app/src/main/res/xml/account_media_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_media_prefs.xml
@@ -20,42 +20,32 @@ along with this program; if not, write to the Free Software
-->
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/audio_ringtone_category"
- android:title="@string/account_ringtone_label">
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_ringtone_label">
<android.support.v14.preference.SwitchPreference
- android:id="@+id/audio_ringtone"
android:key="Account.ringtoneEnabled"
android:persistent="false"
android:title="@string/account_ringtone_enabled_label" />
<android.support.v14.preference.SwitchPreference
- android:id="@+id/audio_ringtone_custom"
android:key="Account.ringtoneCustom"
android:persistent="true"
android:title="@string/account_ringtone_custom_label" />
<android.support.v7.preference.Preference
- android:id="@+id/audio_ringtone_path"
android:key="Account.ringtonePath"
android:persistent="false"
android:title="@string/account_ringtone_path_label" />
</android.support.v7.preference.PreferenceCategory>
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/audio_codecs"
- android:title="@string/account_audio_label">
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_audio_label">
<cx.ring.fragments.CodecPreference
android:key="Account.audioCodecs"
android:layout="@layout/frag_audio_mgmt"
android:persistent="false" />
</android.support.v7.preference.PreferenceCategory>
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/video_category"
- android:title="@string/account_video_label">
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_video_label">
<android.support.v14.preference.SwitchPreference
- android:id="@+id/enable_video"
android:key="Account.videoEnabled"
android:persistent="false"
android:title="@string/account_video_enable" />
diff --git a/ring-android/app/src/main/res/xml/account_prefs_ring.xml b/ring-android/app/src/main/res/xml/account_prefs_ring.xml
index b0c62db01f14a1046fe229432fc5a5b57fd085bb..5cccc2fa2cbe6f0dcd6998c105fa178c82858568 100644
--- a/ring-android/app/src/main/res/xml/account_prefs_ring.xml
+++ b/ring-android/app/src/main/res/xml/account_prefs_ring.xml
@@ -20,9 +20,7 @@ along with this program; if not, write to the Free Software
-->
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_basic_category"
- android:title="@string/account_basic_category" >
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_basic_category" >
<android.support.v7.preference.EditTextPreference
android:id="@+id/account_alias"
android:key="Account.alias"
@@ -30,31 +28,25 @@ along with this program; if not, write to the Free Software
android:summary=""
android:title="@string/account_alias_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_hostname"
android:key="Account.hostname"
android:persistent="false"
android:summary=""
android:title="@string/account_bootstrap_label" />
</android.support.v7.preference.PreferenceCategory>
- <android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_optionnal_category"
- android:title="@string/account_optionnal_category" >
+ <android.support.v7.preference.PreferenceCategory android:title="@string/account_optionnal_category" >
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_useragent"
android:defaultValue=""
android:key="Account.useragent"
android:persistent="false"
android:title="@string/account_useragent_label" />
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_autoanswer"
android:defaultValue="false"
android:key="Account.autoAnswer"
android:persistent="false"
android:title="@string/account_autoanswer_label" />
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_upnp"
android:key="Account.upnpEnabled"
android:persistent="false"
android:title="@string/account_upnp_label" />
diff --git a/ring-android/app/src/main/res/xml/account_security_prefs.xml b/ring-android/app/src/main/res/xml/account_security_prefs.xml
index 75948c32ac6a35078515aedefa6e97d0873c5656..90f3d3f809158260daf3be9fcb5295ea60033706 100644
--- a/ring-android/app/src/main/res/xml/account_security_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_security_prefs.xml
@@ -20,57 +20,48 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_credentials_category"
android:key="Account.credentials"
android:title="@string/account_credentials_label">
<cx.ring.views.CredentialsPreference
- android:id="@+id/account_credential_number"
android:icon="@drawable/ic_action_new_dark"
android:key="Add.credentials"
android:title="@string/account_credentials_add" />
</android.support.v7.preference.PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
- android:id="@+id/account_security_category"
android:key="TLS.category"
android:title="@string/account_preferences_security_tab">
<android.support.v14.preference.SwitchPreference
- android:id="@+id/account_tls_switch_tls"
android:key="TLS.enable"
android:persistent="false"
android:title="@string/account_tls_transport_switch_label" />
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_tls_port"
android:dependency="TLS.enable"
android:key="TLS.listenerPort"
android:persistent="false"
android:title="@string/account_tls_port_label" />
<android.support.v7.preference.Preference
- android:id="@+id/account_tls_certificate_list_file"
android:dependency="TLS.enable"
android:key="TLS.certificateListFile"
android:persistent="false"
android:title="@string/account_tls_certificate_list_label" />
<android.support.v7.preference.Preference
- android:id="@+id/account_tls_certificate_file"
android:dependency="TLS.enable"
android:key="TLS.certificateFile"
android:persistent="false"
android:title="@string/account_tls_certificate_file_label" />
<android.support.v7.preference.Preference
- android:id="@+id/account_tls_private_key_file"
android:dependency="TLS.enable"
android:key="TLS.privateKeyFile"
android:persistent="false"
android:title="@string/account_tls_private_key_file_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_tls_password"
android:dependency="TLS.enable"
android:key="TLS.password"
android:persistent="false"
@@ -78,21 +69,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_tls_password_label" />
<android.support.v7.preference.ListPreference
- android:id="@+id/account_tls_method"
android:dependency="TLS.enable"
android:key="TLS.method"
android:persistent="false"
android:title="@string/account_tls_method_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_tls_ciphers"
android:dependency="TLS.enable"
android:key="TLS.ciphers"
android:persistent="false"
android:title="@string/account_tls_ciphers_label" />
<android.support.v7.preference.EditTextPreference
- android:id="@+id/account_tls_server_name"
android:dependency="TLS.enable"
android:key="TLS.serverName"
android:persistent="false"
@@ -100,28 +88,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:title="@string/account_tls_server_name_label" />
<cx.ring.views.EditTextIntegerPreference
- android:id="@+id/account_tls_timeout_sec"
android:dependency="TLS.enable"
android:key="TLS.negotiationTimeoutSec"
android:persistent="false"
android:title="@string/account_tls_negotiation_timeout_sec" />
<android.support.v7.preference.CheckBoxPreference
- android:id="@+id/account_tls_verify_server"
android:dependency="TLS.enable"
android:key="TLS.verifyServer"
android:persistent="false"
android:title="@string/account_tls_verify_server_label" />
<android.support.v7.preference.CheckBoxPreference
- android:id="@+id/account_tls_verify_client"
android:dependency="TLS.enable"
android:key="TLS.verifyClient"
android:persistent="false"
android:title="@string/account_tls_verify_client_label" />
<android.support.v7.preference.CheckBoxPreference
- android:id="@+id/account_tls_require_client_cert"
android:dependency="TLS.enable"
android:key="TLS.requireClientCertificate"
android:persistent="false"