diff --git a/ring-android/app/src/main/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml index 44164c128ed8c26b6a2d6686782fdaffc6d5e0b2..ebe6829adf59fa261d9632d4fcc3a1a3e089eb09 100644 --- a/ring-android/app/src/main/AndroidManifest.xml +++ b/ring-android/app/src/main/AndroidManifest.xml @@ -151,11 +151,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. android:label="@string/app_name" android:screenOrientation="fullUser" android:theme="@style/AppThemeBase" /> - <activity - android:name=".client.NewConversationActivity" - android:label="@string/app_name" - android:screenOrientation="fullUser" - android:theme="@style/AppThemeBase" /> <receiver android:name=".service.OutgoingCallHandler"> <intent-filter> diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java deleted file mode 100644 index 223034eec3970e7eb78291a774523023a3cbb60f..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Copyright (C) 2004-2016 Savoir-faire Linux Inc. - * - * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com> - * Author: Adrien Béraud <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. - */ - -package cx.ring.adapters; - -import android.content.Context; -import android.graphics.Bitmap; -import android.util.LruCache; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.animation.AnimationUtils; -import android.widget.BaseAdapter; -import android.widget.ImageButton; -import android.widget.ImageView; -import android.widget.SectionIndexer; -import android.widget.TextView; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.concurrent.ExecutorService; - -import cx.ring.R; -import cx.ring.fragments.ContactListFragment; -import cx.ring.model.CallContact; -import cx.ring.utils.BitmapUtils; -import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; - -public class ContactsAdapter extends BaseAdapter implements StickyListHeadersAdapter, SectionIndexer { - private final ExecutorService infosFetcher; - private final Context mContext; - private ArrayList<CallContact> mContacts; - private int[] mSectionIndices; - private Character[] mSectionLetters; - WeakReference<ContactListFragment.Callbacks> parent; - private LayoutInflater mInflater; - - final private LruCache<Long, Bitmap> mMemoryCache; - - private static final String TAG = ContactsAdapter.class.getSimpleName(); - - public ContactsAdapter(Context c, ContactListFragment.Callbacks cb, LruCache<Long, Bitmap> cache, ExecutorService pool) { - super(); - mContext = c; - mInflater = LayoutInflater.from(mContext); - parent = new WeakReference<>(cb); - mContacts = new ArrayList<>(); - mSectionIndices = getSectionIndices(); - mSectionLetters = getSectionLetters(); - mMemoryCache = cache; - infosFetcher = pool; - } - - private int[] getSectionIndices() { - ArrayList<Integer> sectionIndices = new ArrayList<>(32); - if (mContacts.isEmpty()) { - return new int[0]; - } - - char lastFirstChar = Character.toUpperCase(mContacts.get(0).getDisplayName().charAt(0)); - sectionIndices.add(0); - for (int i = 1; i < mContacts.size(); i++) { - char c = Character.toUpperCase(mContacts.get(i).getDisplayName().charAt(0)); - if (c != lastFirstChar) { - lastFirstChar = c; - sectionIndices.add(i); - } - } - int[] sections = new int[sectionIndices.size()]; - for (int i = 0; i < sectionIndices.size(); i++) { - sections[i] = sectionIndices.get(i); - } - return sections; - } - - private Character[] getSectionLetters() { - Character[] letters = new Character[mSectionIndices.length]; - for (int i = 0; i < mSectionIndices.length; i++) { - letters[i] = Character.toUpperCase(mContacts.get(mSectionIndices[i]).getDisplayName().charAt(0)); - } - return letters; - } - - @Override - public View getView(final int position, View convertView, ViewGroup root) { - ContactView entryView; - - if (convertView == null) { - convertView = mInflater.inflate(R.layout.item_contact, root, false); - - entryView = new ContactView(); - entryView.photo = (ImageView) convertView.findViewById(R.id.photo); - entryView.display_name = (TextView) convertView.findViewById(R.id.display_name); - entryView.quick_call = (ImageButton) convertView.findViewById(R.id.quick_call); - entryView.position = -1; - convertView.setTag(entryView); - } else { - entryView = (ContactView) convertView.getTag(); - } - - final CallContact item = mContacts.get(position); - - if (entryView.contact != null && entryView.contact.get() != null && item.getId() == entryView.contact.get().getId()) { - return convertView; - } - - entryView.display_name.setText(item.getDisplayName()); - entryView.contact = new WeakReference<>(item); - entryView.position = position; - entryView.quick_call.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - parent.get().onCallContact(item); - } - }); - final Long cid = item.getId(); - final Long pid = item.getPhotoId(); - Bitmap bmp = BitmapUtils.bytesToBitmap(item.getPhoto()); - if (bmp == null) { - bmp = mMemoryCache.get(pid); - if (bmp != null) { - item.setPhoto(BitmapUtils.bitmapToBytes(bmp)); - } - } - - if (bmp != null) { - entryView.photo.setImageBitmap(bmp); - } else { - entryView.photo.setImageBitmap(null); - final WeakReference<ContactView> wh = new WeakReference<>(entryView); - infosFetcher.execute(new ContactDetailsTask(mContext, entryView.photo, null, item, new ContactDetailsTask.DetailsLoadedCallback() { - @Override - public void onDetailsLoaded(final Bitmap bmp, final String name) { - mMemoryCache.put(pid, bmp); - final ContactView fh = wh.get(); - if (fh == null || fh.photo.getParent() == null) { - return; - } - if (fh.position == position) - fh.photo.post(new Runnable() { - @Override - public void run() { - final CallContact c = fh.contact.get(); - if (c.getId() == cid) { - c.setPhoto(BitmapUtils.bitmapToBytes(bmp)); - fh.photo.setImageBitmap(bmp); - fh.photo.startAnimation(AnimationUtils.loadAnimation(fh.photo.getContext(), R.anim.contact_fadein)); - } - } - }); - } - })); - } - - return convertView; - } - - /********************* - * ViewHolder Pattern - *********************/ - public class ContactView { - ImageButton quick_call; - ImageView photo; - TextView display_name; - WeakReference<CallContact> contact = new WeakReference<>(null); - int position; - } - - @Override - public int getCount() { - return mContacts.size(); - } - - @Override - public int getViewTypeCount() { - return 2; - } - - @Override - public long getItemId(int position) { - return 0; - } - - @Override - public View getHeaderView(int position, View convertView, ViewGroup parent) { - HeaderViewHolder holder; - - if (convertView == null) { - holder = new HeaderViewHolder(); - convertView = mInflater.inflate(R.layout.header, parent, false); - holder.text = (TextView) convertView.findViewById(R.id.header_letter); - convertView.setTag(holder); - } else { - holder = (HeaderViewHolder) convertView.getTag(); - } - - // set header text as first char in name - holder.text.setText(String.valueOf(Character.toUpperCase(mContacts.get(position).getDisplayName().charAt(0)))); - - return convertView; - } - - class HeaderViewHolder { - TextView text; - } - - @Override - public long getHeaderId(int position) { - // return the first character of the name as ID because this is what - // headers are based upon - return Character.toUpperCase(mContacts.get(position).getDisplayName().charAt(0)); - } - - @Override - public int getPositionForSection(int section) { - if (section >= mSectionIndices.length) { - section = mSectionIndices.length - 1; - } else if (section < 0) { - section = 0; - } - return mSectionIndices[section]; - } - - @Override - public int getSectionForPosition(int position) { - for (int i = 0; i < mSectionIndices.length; i++) { - if (position < mSectionIndices[i]) { - return i - 1; - } - } - return mSectionIndices.length - 1; - } - - @Override - public Object[] getSections() { - return mSectionLetters; - } - - @Override - public CallContact getItem(int position) { - return mContacts.get(position); - } - - public void clear() { - mContacts = new ArrayList<>(); - mSectionIndices = new int[0]; - mSectionLetters = new Character[0]; - } - - public void setData(ArrayList<CallContact> contacts) { - mContacts = contacts; - mSectionIndices = getSectionIndices(); - mSectionLetters = getSectionLetters(); - notifyDataSetChanged(); - } - -} diff --git a/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java deleted file mode 100644 index de42230b7d5b86c2bc7b3940624e2f7c20b3a7d3..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2004-2016 Savoir-faire Linux Inc. - * - * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com> - * Author: Adrien Béraud <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. - */ - -package cx.ring.adapters; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import cx.ring.R; -import cx.ring.model.CallContact; -import cx.ring.utils.BitmapUtils; - -public class StarredContactsAdapter extends BaseAdapter { - - private ExecutorService infos_fetcher = Executors.newCachedThreadPool(); - private ArrayList<CallContact> dataset; - Context mContext; - -// private static final String TAG = ContactsAdapter.class.getSimpleName(); - - public StarredContactsAdapter(Context context) { - super(); - mContext = context; - dataset = new ArrayList<>(); - } - - public void setData(ArrayList<CallContact> contacts) { - dataset = contacts; - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return dataset.size(); - } - - @Override - public CallContact getItem(int index) { - return dataset.get(index); - } - - @Override - public long getItemId(int index) { - return dataset.get(index).getId(); - } - - @Override - public View getView(int pos, View convView, ViewGroup parent) { - - View v = convView; - LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - if (v == null) { - v = inflater.inflate(R.layout.item_contact_starred, parent, false); - } - - CallContact item = dataset.get(pos); - - ((TextView) v.findViewById(R.id.display_name)).setText(item.getDisplayName()); - ImageView photo_view = (ImageView) v.findViewById(R.id.photo); - - if (item.hasPhoto()) { - photo_view.setImageBitmap(BitmapUtils.bytesToBitmap(item.getPhoto())); - } else { - infos_fetcher.execute(new ContactDetailsTask(mContext, photo_view, item)); - } - return v; - } -} \ No newline at end of file diff --git a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java index df29b0538cd1637f1357dbc812191853dba2b5bd..ef1ab9edc9c88bac19f635f073cf2d4e02dbacf1 100644 --- a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java +++ b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java @@ -66,7 +66,6 @@ import cx.ring.R; import cx.ring.about.AboutFragment; import cx.ring.application.RingApplication; import cx.ring.fragments.AccountsManagementFragment; -import cx.ring.fragments.ContactListFragment; import cx.ring.fragments.SmartListFragment; import cx.ring.model.Account; import cx.ring.model.CallContact; @@ -82,8 +81,7 @@ import cx.ring.utils.FileUtils; public class HomeActivity extends AppCompatActivity implements LocalService.Callbacks, RingNavigationFragment.OnNavigationSectionSelected, - ActivityCompat.OnRequestPermissionsResultCallback, - ContactListFragment.Callbacks { + ActivityCompat.OnRequestPermissionsResultCallback { static final String TAG = HomeActivity.class.getSimpleName(); @@ -649,7 +647,6 @@ public class HomeActivity extends AppCompatActivity implements LocalService.Call .addToBackStack(SETTINGS_TAG).commit(); } - @Override public void onCallContact(final CallContact c) { Log.d(TAG, "onCallContact " + c.toString() + " " + c.getId() + " " + c.getKey()); if (c.getPhones().size() > 1) { @@ -680,7 +677,6 @@ public class HomeActivity extends AppCompatActivity implements LocalService.Call } } - @Override public void onTextContact(final CallContact c) { if (c.getPhones().size() > 1) { final CharSequence numbers[] = new CharSequence[c.getPhones().size()]; diff --git a/ring-android/app/src/main/java/cx/ring/client/NewConversationActivity.java b/ring-android/app/src/main/java/cx/ring/client/NewConversationActivity.java deleted file mode 100644 index 2fca28fb6636b883c0067d99aab33c1a31eac670..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/client/NewConversationActivity.java +++ /dev/null @@ -1,136 +0,0 @@ -package cx.ring.client; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.ComponentName; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.ServiceConnection; -import android.net.Uri; -import android.os.Bundle; -import android.os.IBinder; -import android.view.MenuItem; - -import cx.ring.R; -import cx.ring.fragments.ContactListFragment; -import cx.ring.model.CallContact; -import cx.ring.model.Phone; -import cx.ring.service.IDRingService; -import cx.ring.service.LocalService; -import cx.ring.utils.ContentUriHandler; - -public class NewConversationActivity extends Activity implements ContactListFragment.Callbacks { - - private LocalService service = null; - - //private SearchView searchView = null; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); - - Intent intent = new Intent(this, LocalService.class); - bindService(intent, mConnection, Context.BIND_AUTO_CREATE); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - unbindService(mConnection); - } - - private final ServiceConnection mConnection = new ServiceConnection() { - @SuppressWarnings("unchecked") - @Override - public void onServiceConnected(ComponentName className, IBinder binder) { - service = ((LocalService.LocalBinder) binder).getService(); - setContentView(R.layout.activity_new_conversation); - } - - @Override - public void onServiceDisconnected(ComponentName name) { - service = null; - } - }; - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - } - return super.onOptionsItemSelected(item); - } - - @Override - public void onCallContact(final CallContact c) { - if (c.getPhones().size() > 1) { - final CharSequence numbers[] = new CharSequence[c.getPhones().size()]; - int i = 0; - for (Phone p : c.getPhones()) - numbers[i++] = p.getNumber().getRawUriString(); - - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.choose_number); - builder.setItems(numbers, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - CharSequence selected = numbers[which]; - Intent intent = new Intent(CallActivity.ACTION_CALL) - .setClass(NewConversationActivity.this, CallActivity.class) - .setData(Uri.parse(selected.toString())); - startActivityForResult(intent, HomeActivity.REQUEST_CODE_CALL); - } - }); - builder.show(); - } else { - Intent intent = new Intent(CallActivity.ACTION_CALL) - .setClass(this, CallActivity.class) - .setData(Uri.parse(c.getPhones().get(0).getNumber().getRawUriString())); - startActivityForResult(intent, HomeActivity.REQUEST_CODE_CALL); - } - } - - @Override - public void onTextContact(final CallContact c) { - if (c.getPhones().size() > 1) { - final CharSequence numbers[] = new CharSequence[c.getPhones().size()]; - int i = 0; - for (Phone p : c.getPhones()) - numbers[i++] = p.getNumber().getRawUriString(); - - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.choose_number); - builder.setItems(numbers, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - CharSequence selected = numbers[which]; - Intent intent = new Intent(Intent.ACTION_VIEW) - .setClass(NewConversationActivity.this, ConversationActivity.class) - .setData(Uri.withAppendedPath(ContentUriHandler.CONVERSATION_CONTENT_URI, c.getIds().get(0))) - .putExtra("number", selected); - startActivityForResult(intent, HomeActivity.REQUEST_CODE_CONVERSATION); - } - }); - builder.show(); - } else { - Intent intent = new Intent(Intent.ACTION_VIEW) - .setClass(this, ConversationActivity.class) - .setData(Uri.withAppendedPath(ContentUriHandler.CONVERSATION_CONTENT_URI, c.getIds().get(0))); - startActivityForResult(intent, HomeActivity.REQUEST_CODE_CONVERSATION); - } - } - - @Override - public IDRingService getRemoteService() { - return service.getRemoteService(); - } - - @Override - public LocalService getService() { - return service; - } -} diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java deleted file mode 100644 index ea17d84a91188d63c994766112e52efc6daa83e8..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java +++ /dev/null @@ -1,284 +0,0 @@ -/* - * Copyright (C) 2004-2016 Savoir-faire Linux Inc. - * - * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com> - * 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. - */ -package cx.ring.fragments; - -import cx.ring.R; -import cx.ring.adapters.ContactsAdapter; -import cx.ring.adapters.StarredContactsAdapter; -import cx.ring.loaders.ContactsLoader; -import cx.ring.loaders.LoaderConstants; -import cx.ring.model.CallContact; -import cx.ring.service.LocalService; -import se.emilsjolander.stickylistheaders.StickyListHeadersListView; - -import android.app.Activity; -import android.app.Fragment; -import android.app.LoaderManager; -import android.content.Loader; -import android.net.Uri; -import android.os.Bundle; -import android.provider.ContactsContract.Contacts; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.View.MeasureSpec; -import android.view.ViewGroup; -import android.view.inputmethod.EditorInfo; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.AdapterView.OnItemLongClickListener; -import android.widget.GridView; -import android.widget.ImageButton; -import android.widget.LinearLayout; -import android.widget.ListAdapter; -import android.widget.SearchView; -import android.widget.SearchView.OnQueryTextListener; -import android.widget.TextView; - -public class ContactListFragment extends Fragment implements OnQueryTextListener, LoaderManager.LoaderCallbacks<ContactsLoader.Result> { - public static final String TAG = "ContactListFragment"; - ContactsAdapter mListAdapter; - StarredContactsAdapter mGridAdapter; - String mCurFilter; - StickyListHeadersListView mContactList; - - // favorite contacts - private LinearLayout llMain; - private GridView mStarredGrid; - private TextView favHeadLabel; - private LinearLayout mHeader; - private ViewGroup newcontact; - - @Override - public void onCreate(Bundle savedInBundle) { - super.onCreate(savedInBundle); - setHasOptionsMenu(true); - } - - public Callbacks mCallbacks = sDummyCallbacks; - /** - * A dummy implementation of the {@link Callbacks} interface that does nothing. Used only when this fragment is not attached to an activity. - */ - private static class DummyCallbacks extends LocalService.DummyCallbacks implements Callbacks { - @Override - public void onCallContact(CallContact c) { - } - @Override - public void onTextContact(CallContact c) { - } - }; - private static final Callbacks sDummyCallbacks = new DummyCallbacks(); - - public interface Callbacks extends LocalService.Callbacks { - void onCallContact(CallContact c); - void onTextContact(CallContact c); - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (!(activity instanceof Callbacks)) { - throw new IllegalStateException("Activity must implement fragment's callbacks."); - } - mCallbacks = (Callbacks) activity; - mGridAdapter = new StarredContactsAdapter(getActivity()); - mListAdapter = new ContactsAdapter(getActivity(), mCallbacks, mCallbacks.getService().get40dpContactCache(), mCallbacks.getService().getThreadPool()); - } - - @Override - public void onDetach() { - super.onDetach(); - mCallbacks = sDummyCallbacks; - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.newconv_option_menu, menu); - MenuItem searchMenuItem = menu.findItem(R.id.menu_contact_search); - SearchView searchView = (SearchView) searchMenuItem.getActionView(); - searchView.setOnQueryTextListener(ContactListFragment.this); - searchView.setImeOptions(EditorInfo.IME_ACTION_GO); - searchMenuItem.expandActionView(); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View inflatedView = inflater.inflate(R.layout.frag_contact_list, container, false); - mHeader = (LinearLayout) inflater.inflate(R.layout.frag_contact_list_header, null); - mContactList = (StickyListHeadersListView) inflatedView.findViewById(R.id.contacts_stickylv); - mContactList.setDivider(null); - - mStarredGrid = (GridView) mHeader.findViewById(R.id.favorites_grid); - llMain = (LinearLayout) mHeader.findViewById(R.id.llMain); - favHeadLabel = (TextView) mHeader.findViewById(R.id.fav_head_label); - newcontact = (ViewGroup) mHeader.findViewById(R.id.newcontact_element); - newcontact.setVisibility(View.GONE); - newcontact.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - CallContact c = (CallContact) v.getTag(); - if (c != null) - mCallbacks.onTextContact(c); - } - }); - newcontact.findViewById(R.id.quick_call).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - CallContact c = (CallContact) newcontact.getTag(); - if (c != null) - mCallbacks.onCallContact(c); - } - }); - return inflatedView; - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - mContactList.addHeaderView(mHeader, null, false); - mContactList.setAdapter(mListAdapter); - - mStarredGrid.setAdapter(mGridAdapter); - - onLoadFinished(null, mCallbacks.getService().getSortedContacts()); - } - - private OnItemLongClickListener mItemLongClickListener = new OnItemLongClickListener() { - @Override - public boolean onItemLongClick(AdapterView<?> av, View view, int pos, long id) { - return false; - } - - }; - - private void setGridViewListeners() { - //mStarredGrid.setOnDragListener(dragListener); - mStarredGrid.setOnItemClickListener(new OnItemClickListener() { - - @Override - public void onItemClick(AdapterView<?> arg0, View v, int pos, long arg3) { - mCallbacks.onCallContact(mGridAdapter.getItem(pos)); - } - }); - mStarredGrid.setOnItemLongClickListener(mItemLongClickListener); - } - - private void setListViewListeners() { - mContactList.getWrappedList().setOnItemLongClickListener(mItemLongClickListener); - } - - @Override - public boolean onQueryTextChange(String newText) { - mCurFilter = newText; - if (newText.isEmpty()) { - getLoaderManager().destroyLoader(LoaderConstants.CONTACT_LOADER); - onLoadFinished(null, mCallbacks.getService().getSortedContacts()); - newcontact.setVisibility(View.GONE); - return true; - } - Bundle b = new Bundle(); - b.putString("filter", mCurFilter); - getLoaderManager().restartLoader(LoaderConstants.CONTACT_LOADER, b, this); - newcontact.setVisibility(View.VISIBLE); - ((TextView)newcontact.findViewById(R.id.display_name)).setText(newText); - CallContact contact = CallContact.buildUnknown(newText); - newcontact.setTag(contact); - return true; - } - - @Override - public boolean onQueryTextSubmit(String query) { - newcontact.callOnClick(); - return true; - } - - @Override - public Loader<ContactsLoader.Result> onCreateLoader(int id, Bundle args) { - Uri baseUri = null; - if (args != null) - baseUri = Uri.withAppendedPath(Contacts.CONTENT_FILTER_URI, Uri.encode(args.getString("filter"))); - ContactsLoader l = new ContactsLoader(getActivity(), baseUri, mCallbacks.getService().getContactCache()); - l.forceLoad(); - return l; - } - - @Override - public void onLoadFinished(Loader<ContactsLoader.Result> loader, ContactsLoader.Result data) { - Log.i(TAG, "onLoadFinished with " + data.contacts.size() + " contacts, " + data.starred.size() + " starred."); - - mListAdapter.setData(data.contacts); - setListViewListeners(); - - mGridAdapter.setData(data.starred); - if (data.starred.isEmpty()) { - llMain.setVisibility(View.GONE); - favHeadLabel.setVisibility(View.GONE); - } else { - llMain.setVisibility(View.VISIBLE); - favHeadLabel.setVisibility(View.VISIBLE); - setGridViewListeners(); - mStarredGrid.post(new Runnable() { - - @Override - public void run() { - setGridViewHeight(mStarredGrid, llMain); - } - }); - } - } - - // Sets the GridView holder's height to fully expand it - public void setGridViewHeight(GridView gridView, LinearLayout llMain) { - ListAdapter listAdapter = gridView.getAdapter(); - if (listAdapter == null) { - return; - } - - int totalHeight = 0; - int firstHeight = 0; - int desiredWidth = MeasureSpec.makeMeasureSpec(gridView.getWidth(), MeasureSpec.AT_MOST); - - int rows = (listAdapter.getCount() + gridView.getNumColumns() - 1) / gridView.getNumColumns(); - - for (int i = 0; i < rows; i++) { - if (i == 0) { - View listItem = listAdapter.getView(i, null, gridView); - listItem.measure(desiredWidth, MeasureSpec.UNSPECIFIED); - firstHeight = listItem.getMeasuredHeight(); - } - totalHeight += firstHeight; - } - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) llMain.getLayoutParams(); - - params.height = (int) (totalHeight + (getResources().getDimension(R.dimen.contact_vertical_spacing) * (rows - 1) + llMain.getPaddingBottom() + llMain.getPaddingTop())); - llMain.setLayoutParams(params); - mHeader.requestLayout(); - } - - @Override - public void onLoaderReset(Loader<ContactsLoader.Result> loader) { - } -} diff --git a/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java deleted file mode 100644 index d38ba566f3b056390892b3ab9971725c63756fb6..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * 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. - */ - -package cx.ring.fragments; - - -import android.app.Activity; -import android.app.Fragment; -import android.content.Context; -import android.os.Bundle; -import android.os.RemoteException; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.ListAdapter; -import android.widget.ListView; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.NavigableMap; - -import cx.ring.R; -import cx.ring.adapters.ContactDetailsTask; -import cx.ring.model.HistoryCall; -import cx.ring.model.HistoryEntry; -import cx.ring.service.IDRingService; - -public class DetailsHistoryEntryFragment extends Fragment { - - DetailHistoryAdapter mAdapter; - HistoryEntry toDisplay; - @SuppressWarnings("unused") - private static final String TAG = DetailsHistoryEntryFragment.class.getSimpleName(); - ContactDetailsTask tasker; - - private ListView lvMain; - private LinearLayout llMain; - private RelativeLayout iv; - - private Callbacks mCallbacks = sDummyCallbacks; - - private static Callbacks sDummyCallbacks = new Callbacks() { - - @Override - public IDRingService getService() { - return null; - } - - @Override - public void onCall(String account, String number) { - } - - }; - - public interface Callbacks { - - IDRingService getService(); - - void onCall(String account, String number); - - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - - if (!(activity instanceof Callbacks)) { - throw new IllegalStateException("Activity must implement fragment's callbacks."); - } - - mCallbacks = (Callbacks) activity; - } - - @Override - public void onDetach() { - super.onDetach(); - mCallbacks = sDummyCallbacks; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - toDisplay = (HistoryEntry) getArguments().get("entry"); - mAdapter = new DetailHistoryAdapter(toDisplay.getCalls(), getActivity()); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) { - View inflatedView = inflater.inflate(R.layout.frag_history_detail, parent, false); - - llMain = (LinearLayout) inflatedView.findViewById(R.id.llMain); - /*llMainHolder = (LinearLayout) inflatedView.findViewById(R.id.llMainHolder);*/ - lvMain = (ListView) inflatedView.findViewById(R.id.lvMain); - lvMain.setAdapter(mAdapter); - iv = (RelativeLayout) inflatedView.findViewById(R.id.iv); - - ((TextView) iv.findViewById(R.id.history_call_name)).setText(toDisplay.getContact().getDisplayName()); - - tasker = new ContactDetailsTask(getActivity(), (ImageView) inflatedView.findViewById(R.id.contact_photo), toDisplay.getContact()); - tasker.run(); -// ((TextView) iv.findViewById(R.id.history_entry_number)).setText(getString(R.string.detail_hist_call_number, toDisplay.getNumber())); - iv.findViewById(R.id.history_call_name).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mCallbacks.onCall(toDisplay.getAccountID(), toDisplay.getNumber()); - } - }); - return inflatedView; - } - - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - } - - private class DetailHistoryAdapter extends BaseAdapter implements ListAdapter { - - ArrayList<HistoryCall> dataset; - Context mContext; - - public DetailHistoryAdapter(NavigableMap<Long, HistoryCall> calls, Context c) { - dataset = new ArrayList<HistoryCall>(calls.descendingMap().values()); - mContext = c; - } - - @Override - public int getCount() { - return dataset.size(); - } - - @Override - public Object getItem(int position) { - return dataset.get(position); - } - - @Override - public long getItemId(int position) { - return 0; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - HistoryCallView entryView = null; - - if (convertView == null) { - // Get a new instance of the row layout view - LayoutInflater inflater = LayoutInflater.from(mContext); - convertView = inflater.inflate(R.layout.item_history_call, null); - - // Hold the view objects in an object - // so they don't need to be re-fetched - entryView = new HistoryCallView(); - entryView.historyCallState = (TextView) convertView.findViewById(R.id.history_call_state); - entryView.formatted_date = (TextView) convertView.findViewById(R.id.history_call_date_formatted); - entryView.formatted_hour = (TextView) convertView.findViewById(R.id.history_call_hour); - entryView.record = (Button) convertView.findViewById(R.id.history_call_record); - entryView.duration = (TextView) convertView.findViewById(R.id.history_call_duration); - - convertView.setTag(entryView); - } else { - entryView = (HistoryCallView) convertView.getTag(); - } - - final HistoryCall item = dataset.get(position); - - entryView.historyCallState.setText(item.getDirection()); - entryView.formatted_date.setText(item.getDate()); - entryView.duration.setText(item.getDurationString()); - entryView.formatted_hour.setText(item.getStartString("h:mm a")); - if (item.isIncoming() && item.isMissed()) - convertView.setBackgroundColor(getResources().getColor(R.color.holo_red_light)); - - if (item.hasRecord()) { - entryView.record.setVisibility(View.VISIBLE); - entryView.record.setTag(R.id.history_call_record, true); - entryView.record.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - try { - if ((Boolean) v.getTag(R.id.history_call_record)) { - mCallbacks.getService().startRecordedFilePlayback(item.getRecordPath()); - v.setTag(R.id.replay, false); - ((Button) v).setText(getString(R.string.hist_replay_button_stop)); - } else { - mCallbacks.getService().stopRecordedFilePlayback(item.getRecordPath()); - v.setTag(R.id.history_call_record, true); - ((Button) v).setText(getString(R.string.hist_replay_button)); - } - } catch (RemoteException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - }); - } - - return convertView; - } - - /** - * ****************** - * ViewHolder Pattern - * ******************* - */ - public class HistoryCallView { - protected TextView historyCallState; - protected TextView formatted_date; - protected TextView formatted_hour; - protected Button record; - protected TextView duration; - } - - } - -} diff --git a/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java b/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java deleted file mode 100644 index aa612595c64665ad3554c60d22cc358cb04f23cc..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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. - */ - -package cx.ring.fragments; - -import android.app.DialogFragment; -import cx.ring.R; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.ArrayAdapter; -import android.widget.ListAdapter; -import android.widget.ListView; - -public class DropActionsChoice extends DialogFragment { - - ListAdapter mAdapter; - private Bundle args; - public static final int REQUEST_TRANSFER = 10; - public static final int REQUEST_CONF = 20; - - /** - * Create a new instance of CallActionsDFragment - */ - public static DropActionsChoice newInstance() { - DropActionsChoice f = new DropActionsChoice(); - return f; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Pick a style based on the num. - int style = DialogFragment.STYLE_NORMAL, theme = 0; - setStyle(style, theme); - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - ListView rootView = new ListView(getActivity()); - - args = getArguments(); - mAdapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.drop_actions)); - - // ListView list = (ListView) rootView.findViewById(R.id.concurrent_calls); - rootView.setAdapter(mAdapter); - rootView.setOnItemClickListener(new OnItemClickListener() { - - @Override - public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) { - Intent in = new Intent(); - - in.putExtra("transfer", args.getParcelable("call_initial")); - in.putExtra("target", args.getParcelable("call_targeted")); - - switch (pos) { - case 0: // Transfer - getTargetFragment().onActivityResult(REQUEST_TRANSFER, 0, in); - break; - case 1: // Conference - getTargetFragment().onActivityResult(REQUEST_CONF, 0, in); - break; - } - dismiss(); - - } - }); - - final AlertDialog a = new AlertDialog.Builder(getActivity()).setView(rootView).setTitle("Choose Action") - .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - dismiss(); - } - }).create(); - - return a; - } - -} diff --git a/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java index 00becc8f25ef5046f91533a27a61acea7a9aaa7f..39d76b3d702c46abe89222385939c2551484c9de 100644 --- a/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java +++ b/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java @@ -615,14 +615,10 @@ public class SmartListFragment extends Fragment implements SearchView.OnQueryTex private void setOverflowMenuVisible(final Menu menu, boolean visible) { if (null != menu) { MenuItem scanQrMenuItem = menu.findItem(R.id.menu_scan_qr); - MenuItem clearHistoryMenuItem = menu.findItem(R.id.menu_clear_history); if (null != scanQrMenuItem) { scanQrMenuItem.setVisible(visible); } - if (null != clearHistoryMenuItem) { - clearHistoryMenuItem.setVisible(visible); - } } } diff --git a/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java b/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java deleted file mode 100644 index 22d563e8479dfea80636e65da8ce70496b0bb5a2..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - */ -package cx.ring.interfaces; - -public interface AccountsInterface { - - public void accountsChanged(); - - public void accountStateChanged(String accoundID, String state, int code); - - -} diff --git a/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java b/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java deleted file mode 100644 index a82a63818fe6435efc165f7f1dc88ecf02003eab..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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. - */ - -package cx.ring.loaders; - -public class LoaderConstants { - - public static final int CONTACT_LOADER = 0; - public static final int ACCOUNTS_LOADER = 1; - public static final int ACCOUNTS_STATE_LOADER = 2; - public static final int HISTORY_LOADER = 3; - -} diff --git a/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java b/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java deleted file mode 100644 index 6cb9e1f75f53491cdcc182f2e6e091cb95470aaf..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * 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. - */ - -package cx.ring.views; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapShader; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Shader; -import android.graphics.drawable.BitmapDrawable; -import android.util.AttributeSet; -import android.widget.ImageView; - -public class CircularImageView extends ImageView -{ - private int borderWidth = 4; - private int viewWidth; - private int viewHeight; - private Bitmap image; - private Paint paint; - private Paint paintBorder; - private BitmapShader shader; - - public CircularImageView(Context context) - { - super(context); - setup(); - } - - public CircularImageView(Context context, AttributeSet attrs) - { - super(context, attrs); - setup(); - } - - public CircularImageView(Context context, AttributeSet attrs, int defStyle) - { - super(context, attrs, defStyle); - setup(); - } - - private void setup() - { - // init paint - paint = new Paint(); - paint.setAntiAlias(true); - - paintBorder = new Paint(); - setBorderColor(Color.WHITE); - paintBorder.setAntiAlias(true); - this.setLayerType(LAYER_TYPE_SOFTWARE, paintBorder); - paintBorder.setShadowLayer(4.0f, 0.0f, 2.0f, Color.BLACK); - } - - public void setBorderWidth(int borderWidth) - { - this.borderWidth = borderWidth; - this.invalidate(); - } - - public void setBorderColor(int borderColor) - { - if (paintBorder != null) - paintBorder.setColor(borderColor); - - this.invalidate(); - } - - private void loadBitmap() - { - BitmapDrawable bitmapDrawable = (BitmapDrawable) this.getDrawable(); - - if (bitmapDrawable != null) - image = bitmapDrawable.getBitmap(); - } - - @SuppressLint("DrawAllocation") - @Override - public void onDraw(Canvas canvas) - { - // load the bitmap - loadBitmap(); - - // init shader - if (image != null) - { - shader = new BitmapShader(Bitmap.createScaledBitmap(image, canvas.getWidth(), canvas.getHeight(), false), Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); - paint.setShader(shader); - int circleCenter = viewWidth / 2; - - // circleCenter is the x or y of the view's center - // radius is the radius in pixels of the cirle to be drawn - // paint contains the shader that will texture the shape - canvas.drawCircle(circleCenter + borderWidth, circleCenter + borderWidth, circleCenter + borderWidth - 4.0f, paintBorder); - canvas.drawCircle(circleCenter + borderWidth, circleCenter + borderWidth, circleCenter - 4.0f, paint); - } - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) - { - int width = measureWidth(widthMeasureSpec); - int height = measureHeight(heightMeasureSpec, widthMeasureSpec); - - viewWidth = width - (borderWidth * 2); - viewHeight = height - (borderWidth * 2); - - setMeasuredDimension(width, height); - } - - private int measureWidth(int measureSpec) - { - int result = 0; - int specMode = MeasureSpec.getMode(measureSpec); - int specSize = MeasureSpec.getSize(measureSpec); - - if (specMode == MeasureSpec.EXACTLY) - { - // We were told how big to be - result = specSize; - } - else - { - // Measure the text - result = viewWidth; - } - - return result; - } - - private int measureHeight(int measureSpecHeight, int measureSpecWidth) - { - int result = 0; - int specMode = MeasureSpec.getMode(measureSpecHeight); - int specSize = MeasureSpec.getSize(measureSpecHeight); - - if (specMode == MeasureSpec.EXACTLY) - { - // We were told how big to be - result = specSize; - } - else - { - // Measure the text (beware: ascent is a negative number) - result = viewHeight; - } - - return (result + 2); - } -} \ No newline at end of file diff --git a/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java b/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java deleted file mode 100644 index 8b1c4ac44a7164da9d644fe9f521334104c43e5f..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * 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. - * - * Additional permission under GNU GPL version 3 section 7: - * - * If you modify this program, or any covered work, by linking or - * combining it with the OpenSSL project's OpenSSL library (or a - * modified version of that library), containing parts covered by the - * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc. - * grants you additional permission to convey the resulting work. - * Corresponding Source for a non-source form of such a combination - * shall include the source code for the parts of OpenSSL used as well - * as that of the covered work. - */ - -package cx.ring.views; - -import cx.ring.R; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.RectF; -import android.graphics.drawable.BitmapDrawable; -import android.util.AttributeSet; -import android.widget.ImageView; - -public class HalfCircleImageView extends ImageView -{ - private int borderWidth = 0; - private int viewWidth; - private int viewHeight; - private Bitmap image; - private Paint paint; - private Paint paintBorder; - private Paint backgroundPaint; - private RectF viewBounds; - - - public HalfCircleImageView(Context context) - { - super(context); - setup(); - } - - public HalfCircleImageView(Context context, AttributeSet attrs) - { - super(context, attrs); - setup(); - } - - public HalfCircleImageView(Context context, AttributeSet attrs, int defStyle) - { - super(context, attrs, defStyle); - setup(); - } - - private void setup() - { - backgroundPaint = new Paint(); - backgroundPaint.setColor(getResources().getColor(R.color.color_primary_dark)); - backgroundPaint.setAntiAlias(true); - // init paint - paint = new Paint(); - paint.setAntiAlias(true); - - viewBounds = new RectF(); - - paintBorder = new Paint(); - setBorderColor(Color.WHITE); - paintBorder.setAntiAlias(true); - this.setLayerType(LAYER_TYPE_SOFTWARE, paintBorder); - paintBorder.setShadowLayer(4.0f, 0.0f, 2.0f, Color.BLACK); - } - - public void setBorderWidth(int borderWidth) - { - this.borderWidth = borderWidth; - this.invalidate(); - } - - public void setBorderColor(int borderColor) - { - if (paintBorder != null) - paintBorder.setColor(borderColor); - - this.invalidate(); - } - - private void loadBitmap() - { - BitmapDrawable bitmapDrawable = (BitmapDrawable) this.getDrawable(); - - if (bitmapDrawable != null) - image = bitmapDrawable.getBitmap(); - } - - @Override - public void onDraw(Canvas canvas) - { - // load the bitmap - loadBitmap(); - - canvas.drawArc(viewBounds, 180, 180, false, backgroundPaint); - - // init shader - if (image != null) - { -// shader = new BitmapShader(Bitmap.createScaledBitmap(image, canvas.getWidth(), canvas.getHeight(), false), Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); -// paint.setShader(shader); -// int circleCenter = viewWidth / 2; - - // circleCenter is the x or y of the view's center - // radius is the radius in pixels of the cirle to be drawn - // paint contains the shader that will texture the shape -// canvas.drawCircle(circleCenter + borderWidth, circleCenter + borderWidth, circleCenter + borderWidth - 4.0f, paintBorder); - canvas.drawBitmap(image, viewWidth / 2 - image.getWidth() / 2, viewHeight / 3 - image.getHeight() / 2, paint); - - - } - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) - { - int width = measureWidth(widthMeasureSpec); - int height = measureHeight(heightMeasureSpec, widthMeasureSpec); - - viewWidth = width - (borderWidth * 2); - viewHeight = height - (borderWidth * 2); - - viewBounds.set(0, 0, width, height); - - setMeasuredDimension(width, height); - } - - private int measureWidth(int measureSpec) - { - int result = 0; - int specMode = MeasureSpec.getMode(measureSpec); - int specSize = MeasureSpec.getSize(measureSpec); - - if (specMode == MeasureSpec.EXACTLY) - { - // We were told how big to be - result = specSize; - } - else - { - // Measure the text - result = viewWidth; - } - - return result; - } - - private int measureHeight(int measureSpecHeight, int measureSpecWidth) - { - int result = 0; - int specMode = MeasureSpec.getMode(measureSpecHeight); - int specSize = MeasureSpec.getSize(measureSpecHeight); - - if (specMode == MeasureSpec.EXACTLY) - { - // We were told how big to be - result = specSize; - } - else - { - // Measure the text (beware: ascent is a negative number) - result = viewHeight; - } - - return (result); - } - -} \ No newline at end of file diff --git a/ring-android/app/src/main/res/animator/slidein_up.xml b/ring-android/app/src/main/res/animator/slidein_up.xml deleted file mode 100644 index b61cd72d1e2963ab46c660a7ed449c2ec5a4367e..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/animator/slidein_up.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="500" - android:propertyName="y" - android:valueFrom="2000" - android:valueTo="0" - android:interpolator="@android:anim/accelerate_decelerate_interpolator" - android:valueType="floatType" /> \ No newline at end of file diff --git a/ring-android/app/src/main/res/animator/slideout_down.xml b/ring-android/app/src/main/res/animator/slideout_down.xml deleted file mode 100644 index be50687fd41d97b589bef3c2334620929893a265..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/animator/slideout_down.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="500" - android:propertyName="y" - android:valueFrom="0" - android:valueTo="2000" - android:interpolator="@android:anim/accelerate_interpolator" - android:valueType="floatType" /> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_edit_black_24dp.png b/ring-android/app/src/main/res/drawable-hdpi/ic_edit_black_24dp.png deleted file mode 100644 index e531d72a5b717f4eeccbea70fa4bd8f53cc117fc..0000000000000000000000000000000000000000 Binary files a/ring-android/app/src/main/res/drawable-hdpi/ic_edit_black_24dp.png and /dev/null differ diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_edit_black_24dp.png b/ring-android/app/src/main/res/drawable-mdpi/ic_edit_black_24dp.png deleted file mode 100644 index 9efbaae2884ce2b15d160cbc1b1d3aa806545068..0000000000000000000000000000000000000000 Binary files a/ring-android/app/src/main/res/drawable-mdpi/ic_edit_black_24dp.png and /dev/null differ diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png deleted file mode 100644 index 87f8de1ca302d83b746b391b83594f3cb0f39a4a..0000000000000000000000000000000000000000 Binary files a/ring-android/app/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png and /dev/null differ diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png deleted file mode 100644 index 4af4ae634b4c805b2b13c209262bba92d4ef5bdb..0000000000000000000000000000000000000000 Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png and /dev/null differ diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png b/ring-android/app/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png deleted file mode 100644 index d6761ba161c4bc5f665968f7cb761cc7db671822..0000000000000000000000000000000000000000 Binary files a/ring-android/app/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png and /dev/null differ diff --git a/ring-android/app/src/main/res/drawable/background_tabs.xml b/ring-android/app/src/main/res/drawable/background_tabs.xml deleted file mode 100644 index 53e85dffa2da6f1e446876d2f7769034def46432..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/background_tabs.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime"> - - <item android:state_pressed="true" android:drawable="@color/background_tab_pressed" /> - <item android:state_focused="true" android:drawable="@color/background_tab_pressed" /> - <item android:drawable="@android:color/transparent" /> -</selector> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/bg_72.png b/ring-android/app/src/main/res/drawable/bg_72.png deleted file mode 100644 index d8efc317257654fef26696dc94785b5cbedca208..0000000000000000000000000000000000000000 Binary files a/ring-android/app/src/main/res/drawable/bg_72.png and /dev/null differ diff --git a/ring-android/app/src/main/res/drawable/bubble_left_selector.xml b/ring-android/app/src/main/res/drawable/bubble_left_selector.xml deleted file mode 100644 index 9a557e3ef415b2273db9d8c87508bb9393ddd5d6..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/bubble_left_selector.xml +++ /dev/null @@ -1,26 +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="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - - <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" /> - </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="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - - <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" /> - </shape></item> - <item><shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/light" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - - <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" /> - </shape></item> - -</selector> diff --git a/ring-android/app/src/main/res/drawable/bubble_right_selector.xml b/ring-android/app/src/main/res/drawable/bubble_right_selector.xml deleted file mode 100644 index 9a557e3ef415b2273db9d8c87508bb9393ddd5d6..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/bubble_right_selector.xml +++ /dev/null @@ -1,26 +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="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - - <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" /> - </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="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - - <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" /> - </shape></item> - <item><shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/light" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - - <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" /> - </shape></item> - -</selector> diff --git a/ring-android/app/src/main/res/drawable/call_button.xml b/ring-android/app/src/main/res/drawable/call_button.xml deleted file mode 100644 index 0a5c97189eaf26f26a4349279f1cf61070977172..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/call_button.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_enabled="true" android:state_pressed="true"> - <shape android:shape="oval"> - <solid android:color="@color/sfl_light_blue" /> - </shape> - </item> - <item> - <shape android:shape="oval"> - <solid android:color="@color/color_primary_dark" /> - </shape> - </item> - -</selector> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/defaultshadowtop.xml b/ring-android/app/src/main/res/drawable/defaultshadowtop.xml deleted file mode 100644 index 10a64a1a1b5327d7168883b4aadda6b794951db6..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/defaultshadowtop.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <gradient - android:angle="270" - android:centerColor="#33000000" - android:endColor="#99000000" - android:startColor="#00000000" /> - -</shape> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/dialer_selector.xml b/ring-android/app/src/main/res/drawable/dialer_selector.xml deleted file mode 100644 index c0066b91bd84e894aa6dd587bbbb601b5ae300de..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/dialer_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/sfl_light_blue" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - </shape></item> - <item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/sfl_light_blue" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - </shape></item> - <item><shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/sfl_light_blue" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - </shape></item> - -</selector> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/divider.xml b/ring-android/app/src/main/res/drawable/divider.xml deleted file mode 100644 index 7dd947137263f48a6c098a7a10b81b7c4c3fd388..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/divider.xml +++ /dev/null @@ -1,6 +0,0 @@ -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - - <size android:width="1dip" /> - <solid android:color="#666666" /> - -</shape> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/drawer_disc_handle.xml b/ring-android/app/src/main/res/drawable/drawer_disc_handle.xml deleted file mode 100644 index bf5d4b91fa092d3fb989febc194cd40734931446..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/drawer_disc_handle.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_enabled="true" android:state_pressed="true"> - <shape android:shape="oval"> - <solid android:color="@color/color_primary_dark" /> - </shape> - </item> - <item android:state_enabled="false"> - <shape android:shape="oval"> - <solid android:color="@color/color_primary_dark" /> - </shape> - </item> - <item> - <shape android:shape="oval"> - <solid android:color="@color/color_primary_dark" /> - </shape> - </item> - -</selector> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/hangup_button.xml b/ring-android/app/src/main/res/drawable/hangup_button.xml deleted file mode 100644 index 47d0a9c216dfd04672ecb172981969c3ba559d03..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/hangup_button.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector - xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_pressed="true" - android:state_enabled="true" > - <shape> - <gradient - android:startColor="#ff8888" - android:endColor="#cc0000" - android:angle="270" /> - <stroke - android:width="3dp" - android:color="#ff8888" /> - <corners - android:radius="3dp" /> - <padding - android:left="10dp" - android:top="20dp" - android:right="10dp" - android:bottom="20dp" /> - </shape> - </item> - - <item android:state_enabled="false" > - <shape> - <gradient - android:startColor="#cccccc" - android:endColor="#cc0000" - android:angle="270" /> - <stroke - android:width="3dp" - android:color="#cc0000" /> - <corners - android:radius="3dp" /> - <padding - android:left="10dp" - android:top="20dp" - android:right="10dp" - android:bottom="20dp" /> - </shape> - </item> - - <item> - <shape> - <gradient - android:startColor="#ff4444" - android:endColor="#cc0000" - android:angle="270" /> - <stroke - android:width="3dp" - android:color="#cc0000" /> - <corners - android:radius="3dp" /> - <padding - android:left="10dp" - android:top="20dp" - android:right="10dp" - android:bottom="20dp" /> - </shape> - </item> -</selector> diff --git a/ring-android/app/src/main/res/drawable/hold_button.xml b/ring-android/app/src/main/res/drawable/hold_button.xml deleted file mode 100644 index 061f3838331db57f2389ec2115157efdcb4bf5c8..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/hold_button.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector - xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_pressed="true" - android:state_enabled="true" > - <shape> - <gradient - android:startColor="#FFBB33" - android:endColor="#FF8800" - android:angle="270" /> - <stroke - android:width="3dp" - android:color="#FF8800" /> - <corners - android:radius="3dp" /> - <padding - android:left="10dp" - android:top="20dp" - android:right="10dp" - android:bottom="20dp" /> - </shape> - </item> - - <item android:state_enabled="false" > - <shape> - <gradient - android:startColor="#cccccc" - android:endColor="#cc0000" - android:angle="270" /> - <stroke - android:width="3dp" - android:color="#FF8800" /> - <corners - android:radius="3dp" /> - <padding - android:left="10dp" - android:top="20dp" - android:right="10dp" - android:bottom="20dp" /> - </shape> - </item> - - <item> - <shape> - <gradient - android:startColor="#FFBB33" - android:endColor="#FF8800" - android:angle="270" /> - <stroke - android:width="3dp" - android:color="#FF8800" /> - <corners - android:radius="3dp" /> - <padding - android:left="10dp" - android:top="20dp" - android:right="10dp" - android:bottom="20dp" /> - </shape> - </item> -</selector> diff --git a/ring-android/app/src/main/res/drawable/ic_action_keyboard_light.xml b/ring-android/app/src/main/res/drawable/ic_action_keyboard_light.xml deleted file mode 100644 index 5df5ec0cc21a9c58e112904cb99950c55d070f84..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/ic_action_keyboard_light.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="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z" - android:fillColor="#FFFFFF"/> -</vector> diff --git a/ring-android/app/src/main/res/drawable/ic_action_remove.xml b/ring-android/app/src/main/res/drawable/ic_action_remove.xml deleted file mode 100644 index 26d0a72ae23537ffed431a866ff9e1823ccb2dca..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/ic_action_remove.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="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" - android:fillColor="#FFFFFF"/> -</vector> diff --git a/ring-android/app/src/main/res/drawable/ic_action_reveal.xml b/ring-android/app/src/main/res/drawable/ic_action_reveal.xml deleted file mode 100644 index 24e682e083a75cb20ea8a20b64d766cb09b8ce5f..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/ic_action_reveal.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="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z" - android:fillColor="#000000"/> -</vector> diff --git a/ring-android/app/src/main/res/drawable/ic_archive_white.xml b/ring-android/app/src/main/res/drawable/ic_archive_white.xml deleted file mode 100644 index 70a6718a9a1f8d47ef9718e4192f710fdb3e36f5..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/ic_archive_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="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z" - android:fillColor="#FFFFFF"/> -</vector> diff --git a/ring-android/app/src/main/res/drawable/item_contact_selector.xml b/ring-android/app/src/main/res/drawable/item_contact_selector.xml deleted file mode 100644 index 432c3fa25998b0e739943e15a3665fffa9679500..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/item_contact_selector.xml +++ /dev/null @@ -1,23 +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> - <solid android:color="@color/sfl_pantone631_blue" /> - <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> - <solid android:color="@color/sfl_pantone631_blue" /> - <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> - <solid android:color="@color/sfl_blue_0" /> - <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/drawable/item_history_selector.xml b/ring-android/app/src/main/res/drawable/item_history_selector.xml deleted file mode 100644 index ee1120e126f13f245b1a914ebfa9b774135d736c..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/item_history_selector.xml +++ /dev/null @@ -1,23 +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/transparent_grey" /> - <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/transparent_grey" /> - <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="@android:color/transparent" /> - <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/drawable/item_keyboard_choice_selector.xml b/ring-android/app/src/main/res/drawable/item_keyboard_choice_selector.xml deleted file mode 100644 index 87d91c7222d0d84a208d592bcf69a062da621b9f..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/item_keyboard_choice_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/sfl_light_blue" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - </shape></item> - <item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/sfl_light_blue" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - </shape></item> - <item><shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/sfl_blue_0" /> - - <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" /> - </shape></item> - -</selector> \ No newline at end of file diff --git a/ring-android/app/src/main/res/drawable/navigation_selector.xml b/ring-android/app/src/main/res/drawable/navigation_selector.xml deleted file mode 100644 index e9572241d67e0c972b1ddf2f380d759b61eee5fd..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/drawable/navigation_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime"> - - <item android:drawable="@color/darker_gray" android:state_pressed="true"/> - <item android:drawable="@color/lighter_gray" android:state_selected="true"/> - <item android:drawable="@color/lighter_gray" android:state_activated="true"/> - -</selector> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/activity_holder.xml b/ring-android/app/src/main/res/layout/activity_holder.xml deleted file mode 100644 index 7700b733a176e26ded5605095fd15d87178e8c01..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/activity_holder.xml +++ /dev/null @@ -1,9 +0,0 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/frag_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".ActivityHolder" - android:background="@drawable/bg_72" > - -</FrameLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml b/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml deleted file mode 100644 index 935a72cd53fcae43c9c387e6c382a8a4c342b8ec..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Copyright (C) 2004-2016 Savoir-faire Linux Inc. - -Author: Alexandre Savard <alexandre.savard@gmail.com> - Alexandre Lision <alexandre.lision@gmail.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:id="@+id/list_accounts_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" /> diff --git a/ring-android/app/src/main/res/layout/clearable_edit_text.xml b/ring-android/app/src/main/res/layout/clearable_edit_text.xml deleted file mode 100644 index 0f29aafc6b19ace13696ed7b48a29b2b3dc24b2c..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/clearable_edit_text.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/dialer_selector" > - - <EditText - android:id="@+id/clearable_edit" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#00000000" - android:hint="@string/dial_hint" - android:imeActionLabel="@string/dial_action_call" - android:imeOptions="actionGo" - android:textColor="@color/white" - android:textColorHint="@color/white" - android:textSize="30sp" /> - - <Button - android:id="@+id/clearable_button_clear" - android:layout_width="30dip" - android:layout_height="30dip" - android:layout_alignBaseline="@+id/clearable_edit" - android:layout_alignParentRight="true" - android:layout_marginRight="5dip" - android:background="@drawable/ic_action_remove" /> - - <ImageView - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/clearable_edit" - android:layout_marginTop="10dp" - android:background="@color/darker_gray" /> - -</RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/dialog_account_backup.xml b/ring-android/app/src/main/res/layout/dialog_account_backup.xml deleted file mode 100644 index b4416f378c57c6f4e9ee5808bfa483e0e144e5e1..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/dialog_account_backup.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: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/newpwd_txt" - android:layout_gravity="center_horizontal" - android:hint="@string/account_backup_new_password" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" - android:layout_marginTop="8dp" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" - android:ems="10" - android:id="@+id/newpwd_confirm_txt" - android:hint="@string/account_backup_confirm_password" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="8dp" /> -</LinearLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/dialog_new_device.xml b/ring-android/app/src/main/res/layout/dialog_new_device.xml deleted file mode 100644 index 039f4d3cae0b97349c9eb14b1af290632b5beadf..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/dialog_new_device.xml +++ /dev/null @@ -1,24 +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="wrap_content" - android:orientation="vertical"> - - <android.support.design.widget.TextInputLayout - android:id="@+id/ring_password_txt_box" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <android.support.design.widget.TextInputEditText - android:id="@+id/pwd_txt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" - android:layout_marginTop="8dp" - android:ems="10" - android:hint="@string/account_new_device_password" - android:inputType="textPassword" /> - </android.support.design.widget.TextInputLayout> -</LinearLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/dialog_username_registration.xml b/ring-android/app/src/main/res/layout/dialog_username_registration.xml deleted file mode 100644 index e8d5deb1dd9b8b9b18f74de4834f88ea71e6e39b..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/dialog_username_registration.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/ring_username_box" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <android.support.design.widget.TextInputLayout - android:id="@+id/ring_username_txt_box" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_marginLeft="12dp" - android:layout_marginRight="12dp"> - - <android.support.design.widget.TextInputEditText - android:id="@+id/ring_username" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/prompt_new_username" - android:imeOptions="actionNext" - android:inputType="textVisiblePassword" - android:lines="1" - android:maxLines="1" /> - </android.support.design.widget.TextInputLayout> - -</LinearLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/frag_dialing.xml b/ring-android/app/src/main/res/layout/frag_dialing.xml deleted file mode 100644 index e3219ae81073c090de520ce6e5e71b9aa3856caf..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/frag_dialing.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- -Copyright (C) 2004-2016 Savoir-faire Linux Inc. - -Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com> -Author: Adrien Béraud <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. ---> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <cx.ring.views.ClearableEditText - android:id="@+id/textField" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="10dp" /> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignLeft="@+id/textField" - android:layout_alignRight="@+id/textField" - android:layout_below="@+id/textField" > - - <ImageView - android:id="@+id/fake_padding" - android:layout_width="match_parent" - android:layout_height="30dp" - android:background="@color/sfl_light_blue" /> - - <LinearLayout - android:id="@+id/keyboard_choice" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/fake_padding" - android:layout_marginBottom="15dp" - android:weightSum="100" > - - <Button - android:id="@+id/numeric_keyboard" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="30" - android:background="@drawable/item_keyboard_choice_selector" - android:contentDescription="@string/dial_numeric_pad" - android:drawableLeft="@drawable/ic_dialpad_white" - android:text="123" - android:textColor="@color/white" - android:textSize="15sp" /> - - <cx.ring.views.CircularImageView - android:id="@+id/fake_dar_band" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="40" - android:background="@drawable/item_keyboard_choice_selector" /> - - <Button - android:id="@+id/alphabetic_keyboard" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="30" - android:background="@drawable/item_keyboard_choice_selector" - android:contentDescription="@string/dial_alphabetic_pad" - android:drawableLeft="@drawable/ic_action_keyboard_light" - android:text="ABC" - android:textColor="@color/white" - android:textSize="15sp" /> - </LinearLayout> - - <ImageButton - android:id="@+id/buttonCall" - android:layout_width="100dp" - android:layout_height="100dp" - android:layout_centerHorizontal="true" - android:background="@drawable/call_button" - android:src="@drawable/ic_call_white" /> - </RelativeLayout> - -</RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/frag_gestures.xml b/ring-android/app/src/main/res/layout/frag_gestures.xml deleted file mode 100644 index e6139bcfbc9ca3f3a567aec33ba391264db90546..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/frag_gestures.xml +++ /dev/null @@ -1,15 +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/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/help_gestures" - android:textAppearance="?android:attr/textAppearanceLarge" /> - -</LinearLayout> diff --git a/ring-android/app/src/main/res/layout/frag_history.xml b/ring-android/app/src/main/res/layout/frag_history.xml deleted file mode 100644 index 228c47e980f878146fe2117da141c5bd99506f19..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/frag_history.xml +++ /dev/null @@ -1,27 +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" > - - <ListView - android:id="@id/android:list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="10dp" - android:dividerHeight="3dp" - android:divider="@null" - android:clickable="true" /> - - <TextView - android:id="@id/android:empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/hist_no_history" - android:textSize="30sp" /> - -</LinearLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/frag_home.xml b/ring-android/app/src/main/res/layout/frag_home.xml deleted file mode 100644 index 9adffadf74aa62693f16b1be1ce2b8957b2ef4e1..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/frag_home.xml +++ /dev/null @@ -1,29 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> -<!-- - <ImageView - android:layout_width="match_parent" - android:layout_height="?android:attr/actionBarSize" - android:layout_alignParentTop="true" - android:background="@color/sfl_dark_blue" /> ---> - <com.astuetz.PagerSlidingTabStrip - android:id="@+id/pts_main" - android:layout_width="match_parent" - android:layout_height="?android:attr/actionBarSize" - android:layout_alignParentTop="true" - android:background="@color/color_primary_light_shadow" - app:pstsIndicatorColor="@color/color_primary_light" - app:pstsShouldExpand="true" - app:pstsUnderlineColor="@color/color_primary_light" /> - - <android.support.v4.view.ViewPager - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/pts_main" /> - -</RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/frag_imessaging.xml b/ring-android/app/src/main/res/layout/frag_imessaging.xml deleted file mode 100644 index cc569d0274c160d2a254e0dea567480a1481c81c..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/frag_imessaging.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ListView - android:id="@+id/message_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/form" - android:stackFromBottom="true" - android:transcriptMode="alwaysScroll" - android:background="@color/color_primary_dark" - android:layout_alignParentTop="true" > - </ListView> - - <LinearLayout - android:id="@+id/form" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="@color/darker_gray" - android:weightSum="4" > - - <EditText - android:id="@+id/send_im_edittext" - android:layout_width="0dp" - android:layout_weight="3" - android:layout_height="wrap_content" - android:imeOptions="actionSend" - android:ems="10" - android:inputType="textCapSentences|textImeMultiLine" /> - - <Button - android:id="@+id/send_im_button" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:text="Send" - android:background="@drawable/item_generic_selector"/> - </LinearLayout> - -</RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/item_history.xml b/ring-android/app/src/main/res/layout/item_history.xml deleted file mode 100644 index 01aba38a151e62669e271f862b185f5b93e00986..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/item_history.xml +++ /dev/null @@ -1,96 +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. ---> - -<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="100dp" - android:background="@drawable/item_history_selector" - android:descendantFocusability="blocksDescendants"> - - <ImageButton - android:id="@+id/photo" - android:layout_width="70dp" - android:layout_height="70dp" - android:layout_centerVertical="true" - android:background="@null" - android:scaleType="centerCrop" /> - - <TextView - android:id="@+id/display_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_toLeftOf="@+id/replay" - android:layout_toRightOf="@+id/photo" - android:paddingLeft="@dimen/padding_small" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Adrien" /> - - <TextView - android:id="@+id/date_start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/display_name" - android:layout_toRightOf="@+id/photo" - android:paddingLeft="@dimen/padding_small" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:layout_toRightOf="@+id/photo" - android:paddingLeft="@dimen/padding_small" - android:weightSum="2" > - - <TextView - android:id="@+id/incomings" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView - android:id="@+id/outgoings" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - </LinearLayout> - - <Button - android:id="@+id/replay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:text="@string/hist_replay_button" - android:textAppearance="?android:attr/textAppearanceSmall" - android:visibility="gone" /> - -</RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/menuheader.xml b/ring-android/app/src/main/res/layout/menuheader.xml deleted file mode 100644 index ebc00007262ebadc2957a205c2a2d378401a2e41..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/menuheader.xml +++ /dev/null @@ -1,7 +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="match_parent" - android:orientation="vertical" - android:id="@+id/menu_head"> -</FrameLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/password_edittext.xml b/ring-android/app/src/main/res/layout/password_edittext.xml deleted file mode 100644 index edd4f123ecbe7151cc3f1832f04430a93093b672..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/password_edittext.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <EditText - android:id="@+id/password_edittext" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:typeface="sans" - android:hint="@string/prompt_password" /> - - <Button - android:id="@+id/password_visibility" - android:layout_width="30dip" - android:layout_height="30dip" - android:layout_alignBaseline="@+id/password_edittext" - android:layout_alignParentRight="true" - android:layout_marginRight="5dip" - android:background="@drawable/ic_action_reveal" /> - -</RelativeLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/layout/quad_number_picker_dialog.xml b/ring-android/app/src/main/res/layout/quad_number_picker_dialog.xml deleted file mode 100644 index 392e1caba9f9cd57f1e8c9c99f1c9d70bc8e9f9c..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/layout/quad_number_picker_dialog.xml +++ /dev/null @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:baselineAligned="false" - android:gravity="center_horizontal" - android:orientation="horizontal" - android:weightSum="100" > - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="7" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="20" - android:gravity="center" - android:orientation="vertical" > - - <TextView - android:id="@+id/picker_title_1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:textAppearanceMedium" /> - - <NumberPicker - android:id="@+id/number_picker_1" - android:layout_width="50dip" - android:layout_height="match_parent" /> - </LinearLayout> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="2" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="20" - android:gravity="center" - android:orientation="vertical" > - - <TextView - android:id="@+id/picker_title_2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:textAppearanceMedium" /> - - <NumberPicker - android:id="@+id/number_picker_2" - android:layout_width="50dip" - android:layout_height="match_parent" /> - </LinearLayout> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="2" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="20" - android:gravity="center" - android:orientation="vertical" > - - <TextView - android:id="@+id/picker_title_3" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:textAppearanceMedium" /> - - <NumberPicker - android:id="@+id/number_picker_3" - android:layout_width="50dip" - android:layout_height="match_parent" /> - </LinearLayout> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="2" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="20" - android:gravity="center" - android:orientation="vertical" > - - <TextView - android:id="@+id/picker_title_4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:textAppearanceMedium" /> - - <NumberPicker - android:id="@+id/number_picker_4" - android:layout_width="50dip" - android:layout_height="match_parent" /> - </LinearLayout> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="7" /> - -</LinearLayout> \ No newline at end of file diff --git a/ring-android/app/src/main/res/menu/activity_holder.xml b/ring-android/app/src/main/res/menu/activity_holder.xml deleted file mode 100644 index c00202823049e8d5b1590e1223f20fef8a966353..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/menu/activity_holder.xml +++ /dev/null @@ -1,9 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/action_settings"/> - -</menu> diff --git a/ring-android/app/src/main/res/menu/history.xml b/ring-android/app/src/main/res/menu/history.xml deleted file mode 100644 index 92f9526c2282585d868745ef3d95929dc1e9489f..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/menu/history.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/menu_clear_history" - android:icon="@drawable/ic_action_remove" - android:orderInCategory="100" - android:showAsAction="never" - android:title="Clear History"/> - -</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 53ce8b10f976244e26b012e3ddf0311a112a059f..44a4790ab726029cef235b3e68bf5e74605175fb 100644 --- a/ring-android/app/src/main/res/values-ar/strings.xml +++ b/ring-android/app/src/main/res/values-ar/strings.xml @@ -7,12 +7,10 @@ <string name="version_section">الإصدار</string> <string name="email_chooser_title">إرسال بريد إلكتروني باستخدام...</string> <!--RingActivity--> - <string name="title_section0">إتصل</string> <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_account_edition_1">إحذف</string> <string name="ab_action_chat">رسائل نصية</string> <!--Left Drawer--> <!--Accessibility--> @@ -24,15 +22,11 @@ <string name="menu_item_settings">إعدادات</string> <string name="menu_item_about">عن Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">مكالمة</string> <string name="dial_number">أطلب رقم</string> - <string name="dial_hint">اكتب رقم هاتف</string> <!--History Fragment--> <string name="hist_replay_button">إعادة</string> <string name="hist_replay_button_stop">توقف</string> - <string name="hist_no_history">لا تاريخ</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">مكالمة: %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="zero">%d مكالمة</item> @@ -58,13 +52,10 @@ <string name="notif_incoming_call">مكالمة واردة</string> <string name="notif_current_call">المكالمات الحالية</string> <!--Call Fragment--> - <string name="me">أنا</string> <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="action_settings">إعدادات</string> - <string name="help_gestures">هذه الرؤية سوف تعين المستخدمين في عدة تفاعلات أثناء المكالمات. سيتم وصف عدة إجراءات؛ ضغط مطول، قذف، swipe، إلخ.</string> <string name="ongoing_call">مكالمة جارية</string> <string name="hist_in_call">مكالمة واردة من %1$s</string> <string name="hist_out_call">مكالمة خارجة من %1$s</string> diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml index 1e16c7133b8938c54f7270a07542deed66866620..b324c4bd586b72717af06b5f125ef3c696debe46 100644 --- a/ring-android/app/src/main/res/values-ar/strings_account.xml +++ b/ring-android/app/src/main/res/values-ar/strings_account.xml @@ -11,7 +11,6 @@ <string name="dialog_wait_create_details">الرجاء الإنتظار في حين نظيف حسابك</string> <string name="help_sip">ترتيب حساب SIP موجود</string> <string name="create_sip_account">أضف</string> - <string name="share_number">تقاسم رقم</string> <!--Strings related to account deletion--> <!--AccountManagementFragment--> <string name="empty_account_list">لا حساب مسجل</string> @@ -51,7 +50,6 @@ <string name="account_credentials_label">الإعتمادات</string> <!--SRTP Details--> <string name="account_preferences_security_tab">تأمين</string> - <string name="account_srtp_deactivated">باطلة المفعول</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">إستعمل المواصلات TLS</string> @@ -70,7 +68,6 @@ <string name="account_rtp_min_port">الحد الأدنى</string> <string name="account_rtp_port_range">نطاق المنفذ RTP الصوتي</string> <!--restore/backup--> - <string name="account_export">تصدير</string> <string name="account_export_end_error_title">خطأ</string> <!--Name registration--> </resources> diff --git a/ring-android/app/src/main/res/values-ar/strings_content_description.xml b/ring-android/app/src/main/res/values-ar/strings_content_description.xml index 533076baf1b7634253875570e4e5a3ee42c92a36..bb97d39064b48c5d766448ab1bc216bc36a11658 100644 --- a/ring-android/app/src/main/res/values-ar/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-ar/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">مكالمة سريعة</string> <string name="contact_picture_description">صورة الإتصال</string> <string name="dial_numeric_pad">لوحة إتصال رقمية</string> - <string name="dial_alphabetic_pad">لوحة إتصال أبجدية</string> </resources> 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 eca6ca0987a2b5c7ac9f62356e6ad06d6e2b87e4..f384026341215ba5c89cae4295368d720d0678ce 100644 --- a/ring-android/app/src/main/res/values-bg/strings.xml +++ b/ring-android/app/src/main/res/values-bg/strings.xml @@ -8,12 +8,10 @@ <string name="no_email_app_installed">Не е открито приложение за е-поща. Инсталирайте такова и ни изпратете доклад.</string> <string name="email_chooser_title">Изпращане на е-писмо чрез…</string> <!--RingActivity--> - <string name="title_section0">Набиране</string> <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_account_edition_1">Изтриване</string> <string name="ab_action_chat">Текстово съобщение</string> <!--Left Drawer--> <!--Accessibility--> @@ -25,15 +23,11 @@ <string name="menu_item_settings">Настройки</string> <string name="menu_item_about">Относно Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Обаждане</string> <string name="dial_number">Наберете номер</string> - <string name="dial_hint">Въведете телефонен номер</string> <!--History Fragment--> <string name="hist_replay_button">Повторение</string> <string name="hist_replay_button_stop">Спиране</string> - <string name="hist_no_history">Няма история</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Набиране на %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d разговор</item> @@ -61,12 +55,9 @@ <string name="notif_current_call_title">Текущ разговор с %1$s</string> <string name="notif_current_call">Текущ разговор</string> <!--Call Fragment--> - <string name="me">Аз</string> <string name="you_txt_prefix">Вие:</string> <string name="action_call_conference">Конференция</string> <string name="action_call_hangup">Затваряне</string> - <string name="action_settings">Настройки</string> - <string name="help_gestures">Този изглед ще обясни на потребителите различните действия по време на разговор. Ще бъдат обяснени различните действия: дълго натискане, влачене, мазване и т.н.</string> <string name="ongoing_call">Текущо обаждане</string> <string name="hist_in_call">Входящо обаждане от %1$s</string> <string name="hist_out_call">Изходящо обаждане до %1$s</string> @@ -87,7 +78,6 @@ <string name="message_sending">Изпращане на съобщение…</string> <string name="time_just_now">Току-що</string> <string name="permission_read_denied">Не беше позволено на приложението да чете от мястото за съхранение на данни, така че не може да работи правилно. Моля, дайте това право на приложението.</string> - <string name="permission_write_denied">Не беше позволено на приложението да записва в мястото за съхранение на данни, така че не може да работи правилно. Моля, дайте това право на приложението.</string> <!--MediaPreferenceFragment--> <string name="permission_dialog_camera_title">Право за използване на камерата</string> <string name="permission_dialog_camera_message">Разговорите с видео изискват правото за използване на камерата. Моля, дайте това право на приложението.</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 f852bbc65fe08ce7e9ed9ac50532318dbcb2445e..0b208ceec4d44b91893a4db74584e38bcb2fe7e2 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 @@ -9,12 +9,10 @@ <string name="error_field_required">Това поле е задължително</string> <string name="dialog_wait_create">Добавяне на акаунт</string> <string name="dialog_wait_create_details">Моля, изчакайте докато новият Ви акаунт бъде добавен…</string> - <string name="help_ring_title">Създаване на акаунт за Ring</string> <string name="help_ring">Акаунтът за Ring Ви позволява да се свързвате безопасно с хора чрез директна връзка през изцяло разпределена мрежа.</string> <string name="help_sip_title">Добавяне на акаунт за SIP</string> <string name="help_sip">Настройка на съществуващ акаунт за SIP</string> <string name="create_sip_account">Добавяне</string> - <string name="share_number">Споделяне на номера</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Изтриване на акаунта?</string> <string name="account_delete_dialog_message">Това действие е необратимо.</string> @@ -60,7 +58,6 @@ <string name="account_credentials_add">Добавяне на идентификационни данни</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Сигурност</string> - <string name="account_srtp_deactivated">Изключен</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Използване на TLS</string> @@ -78,17 +75,12 @@ <string name="account_rtp_max_port">Максимален</string> <string name="account_rtp_min_port">Минимален</string> <!--restore/backup--> - <string name="account_backup_message">Запазете настройките на акаунта и данните за удостоверяване, шифрирани с парола.</string> - <string name="account_backup_new_password">Нова парола</string> - <string name="account_backup_confirm_password">Потвърдете паролата</string> <string name="account_restore_message">Въведете парола за дешифриране на файла.</string> <string name="account_restore_decryption_password">Парола за дешифриране</string> <string name="restore_backup_wait">Моля, изчакайте…</string> - <string name="backup_failed_dialog_msg">Възникна грешка</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="account_export">Изнасяне</string> <string name="account_export_end_error_title">Грешка</string> <string name="account_new_button">Създаване на акаунт за Ring</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-bg/strings_content_description.xml b/ring-android/app/src/main/res/values-bg/strings_content_description.xml index 7c2f94ece1e9b772fb7f1af7f5c5c231052f556c..1aa8b1e60a852969baea38160d530ba730935ea4 100644 --- a/ring-android/app/src/main/res/values-bg/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-bg/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Бързо обаждане</string> <string name="contact_picture_description">Снимка на контакта</string> <string name="dial_numeric_pad">Цифрова клавиатура</string> - <string name="dial_alphabetic_pad">Буквена клавиатура</string> </resources> 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 b787597f07e18e97c97d852bf6d49fd29b8f52b6..57448a482aac11adfed8b82760c744a420b81840 100644 --- a/ring-android/app/src/main/res/values-ca/strings.xml +++ b/ring-android/app/src/main/res/values-ca/strings.xml @@ -7,7 +7,6 @@ <!--Sections--> <string name="menu_item_settings">Opcions</string> <!--Dialing Fragment--> - <string name="dial_action_call">Trucada</string> <!--History Fragment--> <!--DetailsHistory Fragment--> <!--Home Fragment--> @@ -17,7 +16,6 @@ <!--Notifications--> <string name="notif_incoming_call">Trucada entrant</string> <!--Call Fragment--> - <string name="action_settings">Opcions</string> <!--Text messages--> <!--MediaPreferenceFragment--> <!--Read contacts permission--> 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 91c94b8334cc30575f61f88e681b3cc7ec574112..9a0a7a006ee2f1b03f6bad34f5f592dde9ba0eb4 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 @@ -2,12 +2,10 @@ <resources> <string name="version_section">Verze</string> <!--RingActivity--> - <string name="title_section0">Vytočit</string> <string name="title_activity_sflphone_home">Ring</string> <string name="error_no_network">Chybí připojení</string> <!--AB menus--> <string name="ab_account_creation">Nový účet</string> - <string name="ab_account_edition_1">Odstranit</string> <string name="ab_action_chat">Textové zprávy</string> <!--Left Drawer--> <!--Accessibility--> @@ -19,15 +17,11 @@ <string name="menu_item_settings">Nastavení</string> <string name="menu_item_about">O Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Volat</string> <string name="dial_number">Vytočit číslo</string> - <string name="dial_hint">Vložte telefonní číslo</string> <!--History Fragment--> <string name="hist_replay_button">Znovu přehrát</string> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">Žádná historie</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Volat %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Konverzace</item> @@ -56,13 +50,10 @@ <string name="notif_current_call_title">Současný hovor s %1$s</string> <string name="notif_current_call">Současný hovor</string> <!--Call Fragment--> - <string name="me">Já</string> <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="action_settings">Nastavení</string> - <string name="help_gestures"> Tento pohled pomůže uživatelům s různými činnostmi během hovorů. Různé činnosti budou popsány; Dlouhé podržení, posouvání, atd.</string> <string name="ongoing_call">Probíhající hovor</string> <string name="hist_in_call">Příchozí hovor %1$s</string> <string name="hist_out_call">Odchozí hovor %1$s</string> @@ -84,7 +75,6 @@ <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> - <string name="permission_write_denied">Aplikace nemohla zapisovat do 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> 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 6d31205ec4907de8182ad2757291ce2ecb7c7553..46fcab024b21f1cc2b771bfab0ea7a814ccafa00 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 @@ -13,17 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Vytváříte prázdný účet SIP bez platného hostitelského jména. Budete moci pouze vytvářet a přijímat přímé ip hovory. Svůj účet můžete upravit později</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - <item>IAX</item> - </string-array> - <string name="help_ring_title">Vytvořit účet Ring</string> <string name="help_ring">Účet Ring vám umožňuje spojit se s lidmi bezpečně, uživatel s uživatelem, skrze plně decentralizovanou síť.</string> <string name="help_sip_title">Přidat váš účet SIP.</string> <string name="help_sip">Nastavit existující účet SIP.</string> <string name="create_sip_account">Přidat</string> - <string name="share_number">Sdílet číslo</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Odstranit účet ?</string> <string name="account_delete_dialog_message">Tuto činnost nelze vrátit zpět.</string> @@ -32,7 +25,6 @@ <string name="normal_accounts_titles">Účty</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Obecné</string> - <string name="account_preferences_devices_tab">Zařízení</string> <string name="account_basic_category">Základní Nastavení</string> <string name="account_alias_label">Název účtu</string> <string name="account_hostname_label">Hostitelské jméno</string> @@ -72,7 +64,6 @@ <string name="account_credentials_add">Přidat ověřovací údaje</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Bezpečnost</string> - <string name="account_srtp_deactivated">Vypnuto</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Použít Transport TLS</string> @@ -91,17 +82,12 @@ <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_backup_message">Uložit nastavení a ověřovací údaje účtu, heslo zašifrované.</string> - <string name="account_backup_new_password">Nové heslo</string> - <string name="account_backup_confirm_password">Potvrdit heslo</string> <string name="account_restore_message">Vložte heslo pro dešifrování souboru.</string> <string name="account_restore_decryption_password">Heslo dešifrování</string> <string name="restore_backup_wait">Please vyčkejte…</string> - <string name="backup_failed_dialog_msg">Nastala chyba</string> <string name="error_password_char_count">Minimálně 6 znaků</string> <string name="error_passwords_not_equals">Hesla se neshodují</string> <string name="restore_failed_dialog_msg">Nastala chyba</string> - <string name="account_export">Export</string> <string name="account_export_end_error_title">Chyba</string> <string name="account_new_button">Vytvořit účet Ring</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml index a506d200c556fc0c2bce96cbb21f45d6fdc63371..93a8b2572c46f083c9d4640a029f771187c20bd7 100644 --- a/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Rychlý Hovor</string> <string name="contact_picture_description">Obrázek Kontaktu</string> <string name="dial_numeric_pad">Číselná klávesnice</string> - <string name="dial_alphabetic_pad">Abecední klávesnice</string> </resources> 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 9065d2c35b5a244cde54729190b7a312ea2641e8..6f656bfc66b26ab100d4c1c2ddd23e530e3a3697 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 @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Ingen email-app fundet, installerer en for at sende os en rapport</string> <string name="email_chooser_title">Send mail ved brug af...</string> <!--RingActivity--> - <string name="title_section0">Indtast</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Slet</string> <string name="ab_action_chat">Text-besked</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Indstillinger</string> <string name="menu_item_about">Om Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Ring op</string> <string name="dial_number">Indtast et nummer</string> - <string name="dial_hint">Tast telefonnummer</string> <!--History Fragment--> <string name="hist_replay_button">Genafspil</string> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">Ingen historik</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Opkald %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Samtale</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">Aktivt opkald med %1$s</string> <string name="notif_current_call">Nuværende opkald</string> <!--Call Fragment--> - <string name="me">Mig</string> <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="action_settings">Indstillinger</string> - <string name="help_gestures">Denne visning vil hjælpe brugere med at foretage forskellige handlinger under opkald. De forskellige handlinger beskrives; Langt tryk, fling, swype etc.</string> <string name="ongoing_call">Aktivt opkald</string> <string name="hist_in_call">Indgående opkald af %1$s</string> <string name="hist_out_call">Udgående opkald af %1$s</string> @@ -90,7 +81,6 @@ <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> - <string name="permission_write_denied">Mangler tilladelse til at skrive til 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> 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 fd9df6b8c1e1b841d418b4931a7738af65510365..7e25643912da41f03de52877e490d1a0fc261f53 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 @@ -13,16 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Du er ved at oprette en SIP konto uden et gyldigt værtsnavn. Du vil kun kunne foretage eller modtage direkte IP opkald. Du kan rette din konto senere</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Opret en Ring-konto</string> <string name="help_ring">En Ring-konto gør dig i stand til at kontakte andre sikkert og direkte uden mellemmand gennem et fuldt distribueret netværk.</string> <string name="help_sip_title">Tilføj din SIP-konto</string> <string name="help_sip">Konfigurer en eksisterende SIP-konto.</string> <string name="create_sip_account">Tilføj</string> - <string name="share_number">Del nummer</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Slet konto ?</string> <string name="account_delete_dialog_message">Denne handling kan ikke fortrydes.</string> @@ -71,7 +65,6 @@ Du kan rette din konto senere</string> <string name="account_credentials_add">Tilføj Legitimeringsoplysninger</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Sikkerhed</string> - <string name="account_srtp_deactivated">Deaktiveret</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Brug TLS-transport</string> @@ -90,17 +83,12 @@ 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_backup_message">Gem konto-indstillinger og autorisationer, beskyttet af kodeord.</string> - <string name="account_backup_new_password">Nyt kodeord</string> - <string name="account_backup_confirm_password">Bekræft kodeord</string> <string name="account_restore_message">Indtast kodeord for at dekryptere filen.</string> <string name="account_restore_decryption_password">Dekrypteringskodeord</string> <string name="restore_backup_wait">Vent venligt...</string> - <string name="backup_failed_dialog_msg">Der skete en fejl</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_msg">Der skete en fejl</string> - <string name="account_export">Eksporter</string> <string name="account_export_end_error_title">Fejl</string> <string name="account_new_button">Opret en Ring-konto</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_content_description.xml b/ring-android/app/src/main/res/values-da-rDK/strings_content_description.xml index af21bcc0a9e8d9a8e195399ecb643d9a87cdb297..80bdb8c9c769f77d952dad1d37866dcf0efd2ca7 100644 --- a/ring-android/app/src/main/res/values-da-rDK/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-da-rDK/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Hurtigopkald</string> <string name="contact_picture_description">Kontaktbillede</string> <string name="dial_numeric_pad">Numerisk opkaldstastatur</string> - <string name="dial_alphabetic_pad">Alfabetisk opkaldstastatur</string> </resources> 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 d3f53a2d9024c9a9f34cb87554f56df57ffd9420..d3f097effe6756d28df3f3feff63429a142e49ef 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 @@ -8,12 +8,10 @@ <string name="no_email_app_installed">Keine E-Mail-App gefunden, installieren Sie eine, um uns einen Bericht zu schicken</string> <string name="email_chooser_title">Senden von E-Mails über...</string> <!--RingActivity--> - <string name="title_section0">Wählen</string> <string name="title_activity_sflphone_home">Ring</string> <string name="error_no_network">Keine Netzwerkkonnektivität</string> <!--AB menus--> <string name="ab_account_creation">Neues Konto</string> - <string name="ab_account_edition_1">Löschen</string> <string name="ab_action_chat">Textnachrichten</string> <!--Left Drawer--> <!--Accessibility--> @@ -23,15 +21,11 @@ <string name="menu_item_settings">Einstellungen</string> <string name="menu_item_about">Über Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Anrufen</string> <string name="dial_number">Nummer wählen</string> - <string name="dial_hint">Geben Sie die Telefonnummer ein</string> <!--History Fragment--> <string name="hist_replay_button">Wiedergeben</string> <string name="hist_replay_button_stop">Beenden</string> - <string name="hist_no_history">Kein Verlauf</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">%1$s anrufen</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Gespräche</item> @@ -57,12 +51,9 @@ <string name="notif_current_call_title">Aktueller Anruf mit %1$s</string> <string name="notif_current_call">Aktueller Anruf</string> <!--Call Fragment--> - <string name="me">Ich</string> <string name="you_txt_prefix">Sie:</string> <string name="action_call_conference">Konferenz</string> <string name="action_call_hangup">Auflegen</string> - <string name="action_settings">Einstellungen</string> - <string name="help_gestures">Diese Ansicht wird die Benutzer mit verschiedenen Interaktionen während der Gespräche helfen. Verschiedene Aktionen werden beschrieben; Langer Druck, fling, Swype, usw.</string> <string name="ongoing_call">Aktiver Anruf</string> <string name="hist_in_call">Eingehender Anruf von %1$s</string> <string name="hist_out_call">Ausgehende Anruf von %1$s</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 796afb8d293ee7309f6293c9530c9442d63123c2..daca0d145602b15f38ed6697a474e622bd853975 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 @@ -8,14 +8,8 @@ <string name="action_create_short">Registrieren</string> <string name="error_field_required">Dieses Feld ist erforderlich</string> <string name="dialog_wait_create">Konto wird hinzugefügt</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Erstellen einen Ring Konto</string> <string name="help_sip_title">Fügen Sie Ihre SIP-Account</string> <string name="create_sip_account">Hinzufügen</string> - <string name="share_number">Telefonnummer teilen</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Konto löschen?</string> <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string> @@ -58,7 +52,6 @@ <string name="account_credentials_add">Anmeldeinformationen hinzufügen</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Sicherheit</string> - <string name="account_srtp_deactivated">Deaktiviert</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_certificate_list_label">Zertifizierungsstellen</string> @@ -71,15 +64,11 @@ <string name="account_rtp_max_port">Maximum</string> <string name="account_rtp_min_port">Minimum</string> <!--restore/backup--> - <string name="account_backup_new_password">Neues Kennwort</string> - <string name="account_backup_confirm_password">Konto bestätigen</string> <string name="account_restore_decryption_password">Entschlüsselungskennwort</string> <string name="restore_backup_wait">Bitte warten...</string> - <string name="backup_failed_dialog_msg">Fehler aufgetreten</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="account_export">Exportieren</string> <string name="account_export_end_error_title">Fehler</string> <string name="account_new_button">Erstellen einen Ring Konto</string> <!--Name registration--> 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 582693b8758b48e97ac444d32302063f6ee653d9..26724a8ac473de03475297c69fdaac1b4b21a9c5 100644 --- a/ring-android/app/src/main/res/values-de/strings.xml +++ b/ring-android/app/src/main/res/values-de/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Es konnte keine Email-Anwendung gefunden werden, installieren sie eine um uns einen Bericht zu senden</string> <string name="email_chooser_title">Mail wird gesendet mit...</string> <!--RingActivity--> - <string name="title_section0">Wählen</string> <string name="title_activity_sflphone_home">Ring</string> <string name="error_no_network">Keine Netzwerkverbindung</string> <string name="error_mobile_network_available_but_disabled">Bitte erlaube den Zugang zum Mobilfunknetz in den Einstellungen</string> <!--AB menus--> <string name="ab_account_creation">Neues Konto</string> - <string name="ab_account_edition_1">Löschen</string> <string name="ab_action_chat">Textnachrichten</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Einstellungen</string> <string name="menu_item_about">über Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Anruf</string> <string name="dial_number">Nummer wählen</string> - <string name="dial_hint">Nummer eingeben</string> <!--History Fragment--> <string name="hist_replay_button">Erneut wiedergeben</string> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">Kein Verlauf</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">%1$s anrufen</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Unterhaltung</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">Aktueller Anruf mit %1$s</string> <string name="notif_current_call">Aktueller Anruf</string> <!--Call Fragment--> - <string name="me">Ich</string> <string name="you_txt_prefix">Du:</string> <string name="action_call_attended_transfer">Überwachter Transfer</string> <string name="action_call_conference">Konferenz</string> <string name="action_call_hangup">Auflegen</string> - <string name="action_settings">Einstellungen</string> - <string name="help_gestures">Diese Ansicht wird Nutzern mit unterschiedlichen Interaktionen während Anrufen helfen. Unterschiedliche Vorgänge werden beschrieben; lang drücken, schleudern, streichen usw.</string> <string name="ongoing_call">Fortlaufender Anruf</string> <string name="hist_in_call">Eingehender Anruf von %1$s</string> <string name="hist_out_call">Ausgehender Anruf von %1$s</string> @@ -90,7 +81,6 @@ <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 geben Sie diese Berechtigung frei.</string> - <string name="permission_write_denied">Die Anwendung hat keine Berechtigung in den Speicher zu schreiben und funktioniert deswegen nicht richtig. Bitte gaben Sie diese Berechtigung frei.</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 geben Sie diese Berechtigung frei.</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 654463907fa7014ac7a5a525fa229cc16f3f15cc..e8f5375fa768229f45405fa3102ecc12aa3a0e90 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 @@ -15,16 +15,10 @@ <string name="dialog_warn_ip2ip_account_message">Sie sind im Begriff ein SIP-Konto ohne gültigen Hostnamen anzulegen Es wird ihnen nur möglich sein direkte IP-Anrufe zu machen und empfangen Sie können ihr Konto später bearbeiten</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Ein Ring-Konto erstellen</string> <string name="help_ring">Ein Ring-Konto erlaubt es ihnen andere Menschen auf sichere Art direkt über ein verteiltes Netzwerk zu erreichen</string> <string name="help_sip_title">Ihr SIP-Konto hinzufgügen</string> <string name="help_sip">Mit bereits bestehendem SIP-Konto anmelden.</string> <string name="create_sip_account">Hinzufügen</string> - <string name="share_number">Nummer weitergeben</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Konto lôschen</string> <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string> @@ -34,7 +28,6 @@ Sie können ihr Konto später bearbeiten</string> <string name="normal_devices_titles">Bekannte Geräte die mit diesem Ring Konto verknüpft sind</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Allgemein</string> - <string name="account_preferences_devices_tab">Geräte</string> <string name="account_basic_category">Grundlegende Einstellungen</string> <string name="account_alias_label">Kontoname</string> <string name="account_hostname_label">Rechnername</string> @@ -75,7 +68,6 @@ Sie können ihr Konto später bearbeiten</string> <string name="account_credentials_add">Anmeldedaten hinzufügen</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Sicherheit</string> - <string name="account_srtp_deactivated">Deaktiviert</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">TLS-Transportverschlüsselung benutzen</string> @@ -94,24 +86,14 @@ 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_backup_message">Speichere Kontoeinstellungen und Zugangsdaten, verschlüsselt mit Passwort</string> - <string name="account_backup_new_password">Neues Passwort</string> - <string name="account_backup_confirm_password">Passwort bestätigen</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">Neues Gerät hinzufügen</string> - <string name="account_new_device_message">Ring-Konto entsperren um mit neuem Gerät zu verbinden</string> <string name="restore_backup_wait">Bitte warten…</string> - <string name="backup_failed_dialog_msg">Ein Fehler ist aufgetreten</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_msg">Ein Fehler ist aufgetreten</string> - <string name="account_export">Export</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_pin_title">PIN:</string> - <string name="account_export_end_pin_message">Benutzen sie diese PIN zusammen mit ihrem Passwort für ihr Hauptkonto um ihr neues Gerät mit ihrem Ring-Konto in den nächsten 10 Minuten zu verbinden</string> - <string name="account_export_end_decryption_title">Entschlüsselungsfehler</string> <string name="account_export_end_decryption_message">Ihr Konto konnte mit dem angegebenen Passwort nicht entsperrt werden</string> <string name="account_export_end_network_title">Netzwerkfehler</string> <string name="account_export_end_network_message">Das Konto konnte nicht in das Netzwerk exportiert werden. Überprüfen sie ihre Verbindung.</string> @@ -128,7 +110,6 @@ Sie können ihr Konto später bearbeiten</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_creation_error">Fehler beim Erstellen des Kontos</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 das es von einem existierenden Konto in Ring exportiert wurde und das die angegebenen Zugansdaten korrekt sind.</string> <string name="account_no_network_title">Verbindung mit dem Netzwerk nicht möglich</string> diff --git a/ring-android/app/src/main/res/values-de/strings_content_description.xml b/ring-android/app/src/main/res/values-de/strings_content_description.xml index f4c9fae6c9cde9c6b02d2d591b50613f0958044e..ff740b8ace400b16f9748850cc61700f7dbf9078 100644 --- a/ring-android/app/src/main/res/values-de/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-de/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Jetzt anrufen</string> <string name="contact_picture_description">Profilbild</string> <string name="dial_numeric_pad">Numerische Wähltastatur</string> - <string name="dial_alphabetic_pad">Alphabetische Wähltastatur</string> </resources> 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 2611ca195a0861e41becf62bb2d1671123e397a7..e266c6fc12eb6d72142ea2be80b2741b86fd6c28 100644 --- a/ring-android/app/src/main/res/values-el/strings.xml +++ b/ring-android/app/src/main/res/values-el/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Δεν βρέθηκε κάποια εφαρμογή email, εγκαταστήστε μια για μας στείλετε μια αναφορά</string> <string name="email_chooser_title">Αποστολή email σε χρήση...</string> <!--RingActivity--> - <string name="title_section0">Κλήση</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Διαγραφή</string> <string name="ab_action_chat">Μήνυμα κειμένου</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Ρυθμίσεις</string> <string name="menu_item_about">Σχετικά</string> <!--Dialing Fragment--> - <string name="dial_action_call">Κλήση</string> <string name="dial_number">Κλήση αριθμού</string> - <string name="dial_hint">Πληκτρολογήστε κάποιον αριθμό τηλεφώνου</string> <!--History Fragment--> <string name="hist_replay_button">Απάντηση</string> <string name="hist_replay_button_stop">Τερματισμός</string> - <string name="hist_no_history">Όχι Ιστορικό</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Κάλεσε %1$s</string> <!--Home Fragment--> <string name="home_transfering">Μεταφορά κλήσης από %1$s σε %1$s</string> <string name="home_transfer_complet">Η προώθηση ολοκληρώθηκε</string> @@ -58,12 +52,9 @@ <string name="notif_current_call_title">Κλήση σε εξέλιξη με %1$s</string> <string name="notif_current_call">Κλήση σε εξέλιξη</string> <!--Call Fragment--> - <string name="me">Εγώ</string> <string name="you_txt_prefix">Εσύ</string> <string name="action_call_conference">Συνδιάσκεψη</string> <string name="action_call_hangup">Κλείσιμο</string> - <string name="action_settings">Ρυθμίσεις</string> - <string name="help_gestures">Αυτή η οθόνη θα βοηθήσει χρήστες με διαφορετικές επιλογές κατά την διάρκεια των κλήσεων. Διαφορετικές ενέργειες θα εξηγηθούν. Παρατεταμένο πάτημα, καταχώρηση, σύρσιμο κ.α.</string> <string name="ongoing_call">Εξερχόμενη κλήση</string> <string name="hist_in_call">Εισερχόμενη κλήση από %1$s</string> <string name="hist_out_call">Εξερχόμενη κλήση από %1$s</string> @@ -84,7 +75,6 @@ <string name="message_sending">Μήνυμα αποστέλλεται...</string> <string name="time_just_now">Μόλις τώρα</string> <string name="permission_read_denied">Η εφαρμογή δεν ήταν σε θέση να διαβάσει τον δίσκο σας. Με αποτέλεσμα να μην δουλεύει σωστά. Σκεφτείτε να δώσετε δικαιώματα στην λειτουργία αυτή</string> - <string name="permission_write_denied">Η εφαρμογή δεν ήταν σε θέση να γράψει στον δίσκο σας. Με αποτέλεσμα να μην δουλεύει σωστά. Σκεφτείτε να δώσετε δικαιώματα στην λειτουργία αυτή</string> <!--MediaPreferenceFragment--> <string name="permission_dialog_camera_title">Άδεια πρόσβασης στην κάμερα</string> <string name="permission_dialog_camera_message">Οι κλήσεις μέσω βίντεο χρειάζεται την άδεια στην κάμερά για να δουλέψει. Παρακαλώ σκεφτείτε να την ενεργοποιήσετε.</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 ee5fac9941cbafa2292e0825eaeb43966c8a58ae..94506c1fa1d50c03d3e9676c6b5dbbe0dc4f5314 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 @@ -34,7 +34,6 @@ <!--TLS Details--> <string name="account_rtp_port_range">Εύρος θυρών RTP ήχου</string> <!--restore/backup--> - <string name="account_export">Εξαγωγή</string> <string name="account_export_end_error_title">Σφάλμα</string> <!--Name registration--> </resources> diff --git a/ring-android/app/src/main/res/values-el/strings_content_description.xml b/ring-android/app/src/main/res/values-el/strings_content_description.xml index 8c0132bc6d95cd4450ff3b9a8153b119dfcd921a..221c6b04ccfab540bbe2f2202a3e3aa6538ff3bb 100644 --- a/ring-android/app/src/main/res/values-el/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-el/strings_content_description.xml @@ -3,5 +3,4 @@ <!--Strings for xml content description of images--> <string name="contact_quick_call_description">Γρήγορη Κλήση</string> <string name="dial_numeric_pad">Αριθμητικό Πληκτρολόγιο</string> - <string name="dial_alphabetic_pad">Πληκτρολόγιο Γραφής</string> </resources> 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 cd7f8e7b61585269f4a800ec0b6f54e9d03f751b..c8fdb7587557b421744cd63e477990c41522864c 100644 --- a/ring-android/app/src/main/res/values-eo/strings.xml +++ b/ring-android/app/src/main/res/values-eo/strings.xml @@ -2,12 +2,10 @@ <resources> <string name="version_section">Eldono</string> <!--RingActivity--> - <string name="title_section0">Diski</string> <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_account_edition_1">Forigi</string> <string name="ab_action_chat">Text messaging</string> <!--Left Drawer--> <!--Accessibility--> @@ -19,15 +17,11 @@ <string name="menu_item_settings">Agordoj</string> <string name="menu_item_about">Pri Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Voko</string> <string name="dial_number">Diski numeron</string> - <string name="dial_hint">Entajpu telefonnumeron</string> <!--History Fragment--> <string name="hist_replay_button">Reludi</string> <string name="hist_replay_button_stop">Stopi</string> - <string name="hist_no_history">Sen historio</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Voki %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Konversacio</item> @@ -55,13 +49,10 @@ <string name="notif_current_call_title">Aktiva voko kun %1$s</string> <string name="notif_current_call">Aktiva voko</string> <!--Call Fragment--> - <string name="me">Mi</string> <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="action_settings">Agordoj</string> - <string name="help_gestures"> Tiu ĉi vido helpos al uzantoj kun diversaj interagoj dum vokoj. Diversaj agoj priskribatos; Long press, fling, swype etc.</string> <string name="ongoing_call">Aktiva voko</string> <string name="hist_in_call">Eniranta voko de %1$s</string> <string name="hist_out_call">Eliranta voko de %1$s</string> @@ -83,7 +74,6 @@ <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> - <string name="permission_write_denied">La aplikaĵo ne permesatis skribi en 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> 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 63a6ba54f3dc33354aa04b5c56c32fda1e6ebdfd..d199947dda7c495301c1b538ef2bfa757ad014df 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 @@ -13,17 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Vi kreontas novan SIP konton sen valida nomo de gastiga komputilo. Vi nur eblos fari kaj ricevi senperajn ip vokojn. Vi povas redakti vian konton poste</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - <item>IAX</item> - </string-array> - <string name="help_ring_title">Krei Ring konton</string> <string name="help_ring">Ring konto ebligas al vi kontakti homojn sekure en plene disa samtavola reto.</string> <string name="help_sip_title">Aldoni vian SIP konton</string> <string name="help_sip">Agordi ekzistantan SIP konton.</string> <string name="create_sip_account">Aldoni</string> - <string name="share_number">Kunhavi numeron</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Ĉu forigi konton ?</string> <string name="account_delete_dialog_message">Tiu ĉi ago ne povos malfariĝi.</string> @@ -32,7 +25,6 @@ <string name="normal_accounts_titles">Kontoj</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Ĝenerala</string> - <string name="account_preferences_devices_tab">Aparatoj</string> <string name="account_basic_category">Bazaj Agordoj</string> <string name="account_alias_label">Nomo de konto</string> <string name="account_hostname_label">Nomo de gastiga komputilo</string> @@ -72,7 +64,6 @@ <string name="account_credentials_add">Aldoni ensalutilojn</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Sekuro</string> - <string name="account_srtp_deactivated">Malŝaltita</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Uzi TLS Transporton</string> @@ -91,17 +82,12 @@ <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_backup_message">Savi agordojn kaj ensalutilojn de konto, pasvorto ĉifrita.</string> - <string name="account_backup_new_password">Nova pasvorto</string> - <string name="account_backup_confirm_password">Konfirmu pasvorton</string> <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="backup_failed_dialog_msg">Eraro okazis</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="account_export">Elporti</string> <string name="account_export_end_error_title">Eraro</string> <string name="account_new_button">Krei Ring konton</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-eo/strings_content_description.xml b/ring-android/app/src/main/res/values-eo/strings_content_description.xml index 605270adc3786c7509e6957460f8bbd45fb2bbcd..51da4927ad5f2a8ed25963fd68874bfde0d00b66 100644 --- a/ring-android/app/src/main/res/values-eo/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-eo/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Rapida Voko</string> <string name="contact_picture_description">Kontakta Bildo</string> <string name="dial_numeric_pad">Ciferilo</string> - <string name="dial_alphabetic_pad">Alfabeta Ciferilo</string> </resources> 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 59bcf07d975b4d1b1e86b838c999f7f9f10ee442..175c3df6ee9ce87ef7d03d88c7953fbbeb1bb6cb 100644 --- a/ring-android/app/src/main/res/values-es/strings.xml +++ b/ring-android/app/src/main/res/values-es/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">No se ha encontrado ninguna aplicación de correo. Instala una para enviarnos el informe</string> <string name="email_chooser_title">Enviar correo usando...</string> <!--RingActivity--> - <string name="title_section0">Marcar</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Borrar</string> <string name="ab_action_chat">Mensaje de texto</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Configuración</string> <string name="menu_item_about">Acerca de Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Llamar</string> <string name="dial_number">Marcar un Número</string> - <string name="dial_hint">Escribir un número de teléfono</string> <!--History Fragment--> <string name="hist_replay_button">Repetir</string> <string name="hist_replay_button_stop">Parar</string> - <string name="hist_no_history">No hay historial</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Llamar a %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Conversacion</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">Llamada en curso con %1$s</string> <string name="notif_current_call">Llamada en curso</string> <!--Call Fragment--> - <string name="me">Yo</string> <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="action_settings">Configuración</string> - <string name="help_gestures">Esta vista ayuda a los usuarios con diferentes interacciones durante las llamadas. Las diferentes acciones se describen a continuación: pulsación larga, función fling y swype del teclado...</string> <string name="ongoing_call">Llamada en curso</string> <string name="hist_in_call">Llamada entrante de %1$s</string> <string name="hist_out_call">Llamada saliente a %1$s</string> @@ -90,7 +81,6 @@ <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 tiene permiso para leer tus archivos. Considera darle los permisos necesarios</string> - <string name="permission_write_denied">La aplicación no puede funcionar correctamente porque no tiene permiso para modificar tus archivos. Considera otorgarle 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> 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 1c5a2adea9aaa6f8bdb315f61cbee5a0ad8d1e99..311ec4d8aff4b421ab7eb0b78608cc7c21892468 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 @@ -13,16 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Estás a punto de crear una cuenta SIP con un nombre de host inválido. Solo podrás realizar y recibir llamadas directas a la IP. Puedes editar tu cuenta luego</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Crear una cuenta en Ring</string> <string name="help_ring">Una cuenta en Ring te permite comunicarte con gente de forma segura a través de una red P2P completamente distribuida.</string> <string name="help_sip_title">Añadir tu cuenta SIP</string> <string name="help_sip">Configurar una cuenta SIP existente</string> <string name="create_sip_account">Agregar</string> - <string name="share_number">Compartir número</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">¿Borrar cuenta?</string> <string name="account_delete_dialog_message">Esta acción no puede deshacerse.</string> @@ -71,7 +65,6 @@ Puedes editar tu cuenta luego</string> <string name="account_credentials_add">Agregar credenciales</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Seguridad</string> - <string name="account_srtp_deactivated">Desactivado</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Usar protocolo TLS</string> @@ -90,17 +83,12 @@ 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_backup_message">Guardar configuración y credenciales de la cuenta, contraseña cifrada.</string> - <string name="account_backup_new_password">Contraseña nueva</string> - <string name="account_backup_confirm_password">Confirmar contraseña</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="restore_backup_wait">Por favor, espera...</string> - <string name="backup_failed_dialog_msg">Ha ocurrido un error</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_msg">Ha ocurrido un error</string> - <string name="account_export">Exportar</string> <string name="account_export_end_error_title">Error</string> <string name="account_new_button">Crear una cuenta en Ring</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-es/strings_content_description.xml b/ring-android/app/src/main/res/values-es/strings_content_description.xml index 9409200fa0485adb8ecb25921c2f4e27997e370d..96458301d5f4d5039ffb86a5b8e43859d6761df0 100644 --- a/ring-android/app/src/main/res/values-es/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-es/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Llamada rápida</string> <string name="contact_picture_description">Foto del contacto</string> <string name="dial_numeric_pad">Teclado numérico</string> - <string name="dial_alphabetic_pad">Teclado alfabético</string> </resources> 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 d03fcd1694d1701ff8233113a516ac631990527d..085c0d56d203738c57c4fe54b588eccc9eca9b78 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 @@ -1,12 +1,10 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <!--RingActivity--> - <string name="title_section0">تماس</string> <string name="title_activity_sflphone_home">رینگ</string> <string name="error_no_network">بدون اتصال شبکه</string> <!--AB menus--> <string name="ab_account_creation">حساب جدید</string> - <string name="ab_account_edition_1">حذف</string> <string name="ab_action_chat">پیام متنی</string> <!--Left Drawer--> <!--Accessibility--> @@ -18,15 +16,11 @@ <string name="menu_item_settings">تنظیمات</string> <string name="menu_item_about">دربارهٔ رینگ</string> <!--Dialing Fragment--> - <string name="dial_action_call">تماس</string> <string name="dial_number">تماس با یک شماره</string> - <string name="dial_hint">شماره تلفن را وارد کنید</string> <!--History Fragment--> <string name="hist_replay_button">پاسخ</string> <string name="hist_replay_button_stop">پایان</string> - <string name="hist_no_history">بدون تاریخچه</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">تماس با %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="other">%d گفتگو</item> @@ -53,13 +47,10 @@ <string name="notif_current_call_title">تماس کنونی با %1$s</string> <string name="notif_current_call">تماس کنونی</string> <!--Call Fragment--> - <string name="me">من</string> <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="action_settings">تنظیمات</string> - <string name="help_gestures">این نما کاربران را دربارهٔ برهمکنشها هنگام تماس راهنمایی میکند. اعمال مختلف شرح داده میشوند؛ فشار طولانی، پرت کردن، کشیدن و…</string> <string name="ongoing_call">تماس خروجی</string> <string name="hist_in_call">تماس دریافتی به مدّت %1$s</string> <string name="hist_out_call">تماس خروجی به مدّت %1$s</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 1e9ca12ccd3580c94841d8b46b4ad90bc9e803c5..5129c0360a5ac39594dd694ad15df24406bd28da 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 @@ -11,7 +11,6 @@ <string name="dialog_wait_create_details">لطفاً صبر کنید تا حساب جدیدتان افزوده شود…</string> <string name="help_sip">پیکربندی یک حساب سیپ موجود.</string> <string name="create_sip_account">افزودن</string> - <string name="share_number">همرسانی شماره</string> <!--Strings related to account deletion--> <!--AccountManagementFragment--> <string name="empty_account_list">هیچ حسابی ثبت نشده</string> @@ -57,7 +56,6 @@ <string name="account_credentials_add">افزودن دستاندر کاران</string> <!--SRTP Details--> <string name="account_preferences_security_tab">امنیت</string> - <string name="account_srtp_deactivated">غیرفعّال شده</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">استفاده از جابهجایی TLS</string> diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_content_description.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_content_description.xml index 7e93f91775d3aaff92abaa8c861e5668e79cc582..3c3bade60036d73c0ff5c204e1d0407d8c5378dc 100644 --- a/ring-android/app/src/main/res/values-fa-rIR/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-fa-rIR/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">تماس سریع</string> <string name="contact_picture_description">نگارهٔ سریع</string> <string name="dial_numeric_pad">صفحهٔ تماس عددی</string> - <string name="dial_alphabetic_pad">صفحهٔ تماس الفبایی</string> </resources> 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 1ec9360ee9aa4cdf351a7826840d13732c8ca311..761527b7ec7509efb470076fd3987aa50a8a3de1 100644 --- a/ring-android/app/src/main/res/values-fi/strings.xml +++ b/ring-android/app/src/main/res/values-fi/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Sähköpostiohjelmaa ei löydetty, asenna sellainen lähettääksesi meille raportin</string> <string name="email_chooser_title">Lähetä sähköpostia käyttäen...</string> <!--RingActivity--> - <string name="title_section0">Numeristo</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Poista</string> <string name="ab_action_chat">Tekstiviestittely</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Asetukset</string> <string name="menu_item_about">Tietoa Ringistä</string> <!--Dialing Fragment--> - <string name="dial_action_call">Soita</string> <string name="dial_number">Valitse numero</string> - <string name="dial_hint">Näppäile puhelinnumero</string> <!--History Fragment--> <string name="hist_replay_button">Toista uudelleen</string> <string name="hist_replay_button_stop">Lopeta</string> - <string name="hist_no_history">Ei historiaa</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Puhelu %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d keskustelu</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">Puhelu %1$s</string> <string name="notif_current_call">Puhelu</string> <!--Call Fragment--> - <string name="me">Minä</string> <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="action_settings">Asetukset</string> - <string name="help_gestures">Tämä näkymä ohjeistaa käyttäjiä puhelunaikaisten eletoimintojen kanssa. Kuten esimerkiksi: pitkä painallus, sinkoaminen, pyyhkäisy ja niin edelleen.</string> <string name="ongoing_call">Tämänhetkinen puhelu</string> <string name="hist_in_call">Saapuva puhelu %1$s</string> <string name="hist_out_call">Lähtevä puhelu %1$s</string> @@ -90,7 +81,6 @@ <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> - <string name="permission_write_denied">Ohjelmalla ei ole kirjoitusoikeuksia massamuistiin.</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> 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 3f02ca1072b2be1988ea518efdb3662527e7c118..62129a0df7f5ec2254793dd576d7ee7055e3b94a 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 @@ -11,12 +11,10 @@ <string name="dialog_wait_create_details">Odota kunnes tunnuksesi on lisätty...</string> <string name="dialog_warn_ip2ip_account_title">Luo tyhjä SIP tunnus?</string> <string name="dialog_warn_ip2ip_account_message">Olet luomassa SIP tunnusta epäkelvolla yhteysosoitteella, pystyt tekemään ja vastaanottamaan vain IP-puheluita. Voit muokata tunnustasi myöhemmin.</string> - <string name="help_ring_title">Luo Ring tunnus</string> <string name="help_ring">Ring tunnuksella tavoitat ihmiset turvalliseseti hajautetun verkon kautta.</string> <string name="help_sip_title">Lisää SIP tunnuksesi</string> <string name="help_sip">Määritä olemassa oleva SIP tunnus.</string> <string name="create_sip_account">Lisää</string> - <string name="share_number">Jaa numero</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Poistetaanko tunnus?</string> <string name="account_delete_dialog_message">Tätä toimintoa ei voi perua.</string> @@ -55,7 +53,6 @@ <string name="account_credentials_add">Lisää käyttöoikeudet</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Turvallisuus</string> - <string name="account_srtp_deactivated">Poistettu käytöstä</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Käytä TLS:ää</string> @@ -72,17 +69,12 @@ <string name="account_rtp_min_port">Minimi</string> <string name="account_rtp_port_range">RTP porttiväli</string> <!--restore/backup--> - <string name="account_backup_message">Tallenna tunnuksen asetukset ja käyttäjäoikeudet, salasana salattuna.</string> - <string name="account_backup_new_password">Uusi salasana</string> - <string name="account_backup_confirm_password">Varmista salasana</string> <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="backup_failed_dialog_msg">Virhe tapahtui</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="account_export">Vie</string> <string name="account_export_end_error_title">Virhe</string> <string name="account_new_button">Luo Ring tunnus</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-fi/strings_content_description.xml b/ring-android/app/src/main/res/values-fi/strings_content_description.xml index 626fdbe430d34ea0e8b8886f4af9d7c471ba0089..2ec12eeef2c767439a0c6f3c2d846007d9724396 100644 --- a/ring-android/app/src/main/res/values-fi/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-fi/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Pikapuhelu</string> <string name="contact_picture_description">Yhteystiedon kuva</string> <string name="dial_numeric_pad">Numeeriset valintanäppäimet</string> - <string name="dial_alphabetic_pad">Aakkoselliset valintanäppäimet</string> </resources> 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 707cc9924d4761876377cf89cfd7ec42f21e6b58..6ec3583c057fcf0fccad432825b966fb2ed4b440 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 @@ -8,12 +8,10 @@ <string name="no_email_app_installed">Aucune adresse courriel n\'a étée trouvée, ajoutez en une pour nous envoyer un rapport.</string> <string name="email_chooser_title">Envoyer un courriel en utilisant</string> <!--RingActivity--> - <string name="title_section0">Composez</string> <string name="title_activity_sflphone_home">Ring</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_account_edition_1">Supprimer</string> <string name="ab_action_chat">Messagerie texte</string> <!--Left Drawer--> <!--Accessibility--> @@ -30,7 +28,6 @@ <!--TransferDFragment--> <!--Notifications--> <!--Call Fragment--> - <string name="action_settings">Réglages</string> <!--Text messages--> <!--MediaPreferenceFragment--> <!--Read contacts permission--> diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml index 28e65e5ae4d49011b2f409deca36e715eb0d4f94..9c72e9f5b31d5dbb7f664ddc3a63d84b24befd23 100644 --- a/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Appel rapide</string> <string name="contact_picture_description">Photo du contact</string> <string name="dial_numeric_pad">Clavier numérique</string> - <string name="dial_alphabetic_pad">Clavier alphabétique</string> </resources> 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 d12098f788ad6754accdda943750b595fae53d20..a4c21cad0e38d4f6383ce689bfb2c7f26816738d 100644 --- a/ring-android/app/src/main/res/values-fr/strings.xml +++ b/ring-android/app/src/main/res/values-fr/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Application d\'envoi de courriel non-trouvée, installez-en un et renvoyez-nous votre rapport</string> <string name="email_chooser_title">Envoi du courriel à travers ...</string> <!--RingActivity--> - <string name="title_section0">Numéroter</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Supprimer</string> <string name="ab_action_chat">Messagerie texte</string> <!--Left Drawer--> <!--Accessibility--> @@ -27,15 +25,11 @@ <string name="menu_item_share">Partager mon contact</string> <string name="menu_item_about">À propos de Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Appelez</string> <string name="dial_number">Composez un numéro</string> - <string name="dial_hint">Entrez un numéro</string> <!--History Fragment--> <string name="hist_replay_button">Écouter</string> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">Pas d\'historique</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Appeler %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Conversation</item> @@ -63,13 +57,10 @@ <string name="notif_current_call_title">Appel en cours avec %1$s</string> <string name="notif_current_call">Appel en cours</string> <!--Call Fragment--> - <string name="me">Moi</string> <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="action_settings">Paramètres</string> - <string name="help_gestures"> Cette vue aidera les utilisateurs avec des interactions différentes pendant des appels. Les actions différentes seront décrites; Appui long, fling, swype etc.</string> <string name="ongoing_call">Appel en cours</string> <string name="hist_in_call">Appel entrant de %1$s</string> <string name="hist_out_call">Appel sortant de %1$s</string> @@ -91,7 +82,6 @@ <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> - <string name="permission_write_denied">L\'application n\'a pas été autorisée à écrire 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> @@ -120,11 +110,8 @@ <string name="prompt_new_password">Nouveau mot de passe</string> <string name="prompt_new_password_repeat">Confirmez le mot de passe</string> <string name="account_create_title">Créer un compte Ring</string> - <string name="help_username_register">Choisir un nom public (expérimental)</string> <string name="prompt_new_username">Entrez un nouveau nom d\'utilisateur</string> <string name="help_password_choose">Choisissez un mot de passe sécurisé dont vous vous rappellerez pour protéger votre compte Ring.</string> - <string name="btn_use_existing_account">Utiliser un compte Ring existant</string> - <string name="btn_create_account">Créer un nouveau compte</string> <string name="help_password_enter">Entrez le mot de passe de votre compte Ring</string> <string name="help_pin_enter">Entrez le code PIN obtenu en configurant un autre compte Ring . Utilisez la fonction \"exportez un compte sur Ring\" pour obtenir un code PIN.</string> <string name="account_device_updated_message">Mise à jour de votre compte Ring réalisée avec succès. </string> @@ -136,7 +123,6 @@ <string name="unknowm_if_empty">Inconnu si laissé vide</string> <string name="unknown">Inconnu</string> <!--Share fragment--> - <string name="share_label">Sélectionnez le Ring ID à partager. </string> <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> </resources> 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 a6407ca77cd6dc60886ec9d897f0ffa213b505e8..aa9f5e4b8d8992c9eb31efc2b443eed849100c6e 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 @@ -16,16 +16,10 @@ <string name="dialog_warn_ip2ip_account_message">Vous êtes sur le point de créer un compte SIP sans avoir fourni un nom d\'hôte correcte. Vous pourrez uniquement faire et recevoir des appels directs directs sur IP. Vous pouvez modifier le compte plus tard.</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Créer un compte Ring</string> <string name="help_ring">Un compte Ring permet de se connecter sécuritairement avec un autre interlocuteur à travers un réseau distribué</string> <string name="help_sip_title">Ajouter votre compte SIP</string> <string name="help_sip">Configurez un compte SIP existant.</string> <string name="create_sip_account">Ajouter</string> - <string name="share_number">Partager votre identifiant Ring</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Supprimer le compte ?</string> <string name="account_delete_dialog_message">Cette action est irréversible.</string> @@ -35,7 +29,6 @@ Vous pouvez modifier le compte plus tard.</string> <string name="normal_devices_titles">Liste des appareils connus liés à votre compte Ring</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Général</string> - <string name="account_preferences_devices_tab">Appareils</string> <string name="account_basic_category">Réglages basiques</string> <string name="account_alias_label">Nom du compte</string> <string name="account_hostname_label">Serveur</string> @@ -77,7 +70,6 @@ Vous pouvez modifier le compte plus tard.</string> <string name="account_credentials_add">Ajouter des identifiants</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Sécurité</string> - <string name="account_srtp_deactivated">Désactivé</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Utiliser le transport TLS</string> @@ -96,35 +88,18 @@ 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_backup">Sauvegarder</string> <string name="account_restore_account">Restaurer un compte</string> - <string name="account_backup_title">sauvegarder un compte</string> - <string name="account_restore_title">Restaurer des comptes</string> - <string name="account_restore_explanation">Vous pouvez restaurer des comptes précédemment sauvegardés.</string> - <string name="account_backup_message">Enregistre les paramètres du compte et les identifiants, en chiffrant le mot de passe.</string> - <string name="account_backup_new_password">Nouveau mot de passe</string> - <string name="account_backup_confirm_password">Confirmer le mot de passe</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">Ajouter un nouvel appareil</string> - <string name="account_new_device_message">Déverrouiller le compte Ring pour lui associer un nouvel appareil.</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="backup_dialog_title">Sauvegarder un compte</string> - <string name="account_backup_result">Sauvegarde effectuée dans %1$s</string> - <string name="backup_failed_dialog_title">Échec de la sauvegarde</string> - <string name="backup_failed_dialog_msg">Une erreur s\'est produite</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="account_export">Exporter</string> <string name="export_account_wait_title">Merci de patienter...</string> <string name="export_account_wait_message">Édition des informations du nouveau compte</string> - <string name="account_export_end_pin_title">PIN :</string> - <string name="account_export_end_pin_message">Veuillez utiliser ce code PIN et le mot de passe de votre compte pour associer votre nouvel appareil à votre compte Ring. Il est valable pendant 10 minutes.</string> - <string name="account_export_end_decryption_title">Erreur de déchiffrement</string> <string name="account_export_end_decryption_message">Impossible de déverrouiller votre compte en utilisant le mot de passe fourni.</string> <string name="account_export_end_network_title">Erreur de réseau</string> <string name="account_export_end_network_message">Impossible d\'exporter le compte sur le réseau. Veuillez vérifier votre connexion. </string> @@ -141,7 +116,6 @@ Vous pouvez modifier le compte plus tard.</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_creation_error">Erreur pendant la création du compte</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> @@ -151,12 +125,9 @@ Vous pouvez modifier le compte plus tard.</string> <string name="account_device_updated_title">Appareil mis à jour</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_password">Entrer votre mot de passe</string> <string name="account_link_prompt_pin">Entrer votre code PIN</string> <string name="account_wizard_title">Compte Ring</string> <string name="account_new_button">Créer un compte Ring</string> - <string name="account_link_infos">Pour lier un autre appareil à votre compte, vous devez d\'abord obtenir un code pin. Pour le générer, veuillez aller dans les paramètres de gestion de comptes d\'un autre appareil, choisissez le compte Ring à utiliser et sélectionnez \"lier un autre appareil à ce compte\"</string> - <string name="account_new_infos">Veuillez choisir un mot de passe de plus de 6 caractères. Ce mot de passe vous sera demandé pour ajouter un nouvel appareil à votre 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> <string name="account_start_export_button">Générer un code PIN</string> diff --git a/ring-android/app/src/main/res/values-fr/strings_content_description.xml b/ring-android/app/src/main/res/values-fr/strings_content_description.xml index dc9c119fa7587a59adf23f2c5728f930d216aaf2..0f5bf8a1cd1b6b4b91c47f8e5888ea463daabc3b 100644 --- a/ring-android/app/src/main/res/values-fr/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-fr/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Quick Call</string> <string name="contact_picture_description">Contact Picture</string> <string name="dial_numeric_pad">Numeric dialpad</string> - <string name="dial_alphabetic_pad">Alphabetic dialpad</string> </resources> 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 29141b02d16a864c6eacdbfd48555758cea5b057..3f99b53f381520dea21c33a66c34dbdc9fa65eea 100644 --- a/ring-android/app/src/main/res/values-he/strings.xml +++ b/ring-android/app/src/main/res/values-he/strings.xml @@ -6,7 +6,6 @@ <string name="error_no_network">אין חיבוריות רשת</string> <!--AB menus--> <string name="ab_account_creation">חשבון חדש</string> - <string name="ab_account_edition_1">מחק</string> <!--Left Drawer--> <!--Accessibility--> <!--Sections--> @@ -15,13 +14,10 @@ <string name="menu_item_settings">הגדרות</string> <string name="menu_item_about">אודות Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">קריאה</string> <!--History Fragment--> <string name="hist_replay_button">נגן שוב</string> <string name="hist_replay_button_stop">עצור</string> - <string name="hist_no_history">אין היסטוריה</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">חייג %1$s</string> <!--Home Fragment--> <string name="home_transfer_complet">העברה הושלמה</string> <!--ContactList Fragment--> @@ -34,11 +30,9 @@ <!--Notifications--> <string name="notif_incoming_call">קריאה נכנסת</string> <!--Call Fragment--> - <string name="me">אני</string> <string name="you_txt_prefix">את(ה):</string> <string name="action_call_conference">ועידה</string> <string name="action_call_hangup"> נתק</string> - <string name="action_settings">הגדרות</string> <!--Text messages--> <string name="send_message">שלח הודעה</string> <!--MediaPreferenceFragment--> diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml index 581e5a084e5a97fc5554df7493b697e730bd9feb..57aea3f525dab8548d92def0ed3e2215081ae21d 100644 --- a/ring-android/app/src/main/res/values-he/strings_account.xml +++ b/ring-android/app/src/main/res/values-he/strings_account.xml @@ -45,7 +45,6 @@ <string name="account_credentials_label">נתוני התחברות</string> <!--SRTP Details--> <string name="account_preferences_security_tab">אבטחה</string> - <string name="account_srtp_deactivated">מנוטרל</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">השתמש בטרנספורט TLS</string> diff --git a/ring-android/app/src/main/res/values-he/strings_content_description.xml b/ring-android/app/src/main/res/values-he/strings_content_description.xml index 538194a98f37ca4c70122c3f1b283e07631c7722..4f1fe0302ce98bccfd791ae10323db0bb5e75faa 100644 --- a/ring-android/app/src/main/res/values-he/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-he/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">שיחה מהירה</string> <string name="contact_picture_description">תצלום איש קשר</string> <string name="dial_numeric_pad">לוח חיוג מספרי</string> - <string name="dial_alphabetic_pad">לוח חיוג א-ת</string> </resources> 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 cb43880a66ce277115467ab72ca0a8e93cfef38c..d0ac301f887983965823fd1c91a227bd08d5c5b2 100644 --- a/ring-android/app/src/main/res/values-hr/strings.xml +++ b/ring-android/app/src/main/res/values-hr/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Nijedna email aplikacija nije pronađena, instalairajte jednu da biste nam poslali izvješće</string> <string name="email_chooser_title">Pošalji mail koristeći...</string> <!--RingActivity--> - <string name="title_section0">Biraj</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Izbriši</string> <string name="ab_action_chat">Dopisivanje</string> <!--Left Drawer--> <!--Accessibility--> @@ -24,15 +22,11 @@ <string name="menu_item_settings">Postavke</string> <string name="menu_item_about">O Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Nazovi</string> <string name="dial_number">Pozovi broj</string> - <string name="dial_hint">Utipkajte telefonski broj</string> <!--History Fragment--> <string name="hist_replay_button">Odgovori</string> <string name="hist_replay_button_stop">Prekini</string> - <string name="hist_no_history">Nema povijesti</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Zovi %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d razgovor</item> @@ -60,11 +54,9 @@ <string name="notif_current_call_title">Trenutni poziv sa %1$s</string> <string name="notif_current_call">Trenutni poziv</string> <!--Call Fragment--> - <string name="me">Ja</string> <string name="you_txt_prefix">Ti:</string> <string name="action_call_conference">Konferencija</string> <string name="action_call_hangup">Poklopi</string> - <string name="action_settings">Postavke</string> <string name="ongoing_call">Poziv koji je u tijeku</string> <string name="hist_in_call">Dolazni poziv od %1$s</string> <string name="hist_out_call">Odlazni poziv prema %1$s</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 e898709b55f93874f60c00be44802bee60fe2ba6..8ea859d344d4463429434945ee54eb8467c79dc6 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 @@ -13,11 +13,9 @@ <string name="dialog_warn_ip2ip_account_message">kreirati ćete SIP račun bez pravilnog imena poslužitelja. Moći ćete uspostavljati i primati samo direktne IP pozive. Moćete urediti vaš račun kasnije</string> - <string name="help_ring_title">Napravite Ring račun</string> <string name="help_sip_title">Dodajte vaš SIP račun</string> <string name="help_sip">Konfigurirajte postojeći SIP račun.</string> <string name="create_sip_account">Dodaj</string> - <string name="share_number">Dijeli broj</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Izbrisati račun?</string> <string name="account_delete_dialog_message"> Ova se radnja ne može poništiti.</string> @@ -58,7 +56,6 @@ Moćete urediti vaš račun kasnije</string> <!--Security Details--> <!--SRTP Details--> <string name="account_preferences_security_tab">Sigurnost</string> - <string name="account_srtp_deactivated">Deaktivirano</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_private_key_file_label">Datoteka privatnog ključa</string> @@ -70,16 +67,12 @@ 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_backup_new_password">Nova lozinka</string> - <string name="account_backup_confirm_password">Potvrdi lozinku</string> <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="backup_failed_dialog_msg">Došlo je do greške</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="account_export">Izvezi</string> <string name="account_export_end_error_title">Greška</string> <string name="account_new_button">Napravite Ring račun</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-hr/strings_content_description.xml b/ring-android/app/src/main/res/values-hr/strings_content_description.xml index e52b02cb1c9ef3f88d3088cf658189b5c2afd0f2..5d7db1c4f50396d38be6678a15292be3e7e94f64 100644 --- a/ring-android/app/src/main/res/values-hr/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-hr/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Brzi poziv</string> <string name="contact_picture_description">Slika kontakta</string> <string name="dial_numeric_pad">Numerička tipkovnica</string> - <string name="dial_alphabetic_pad">Abecedna tipkovnica</string> </resources> 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 f256212b4a7f0f178cc2dffca4587a4344ca9482..1fc54ff2319be6a895d84ac8301b1f59ac723365 100644 --- a/ring-android/app/src/main/res/values-hu/strings.xml +++ b/ring-android/app/src/main/res/values-hu/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Nem találtam emailalkalmazást. Telepítsen egyet, hogy jelentést tudjon küldeni nekünk!</string> <string name="email_chooser_title">Levél küldése a következővel…</string> <!--RingActivity--> - <string name="title_section0">Tárcsázás</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Törlés</string> <string name="ab_action_chat">Szöveges üzenetek</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Beállítások</string> <string name="menu_item_about">A Ringről</string> <!--Dialing Fragment--> - <string name="dial_action_call">Hívás</string> <string name="dial_number">Szám tárcsázása</string> - <string name="dial_hint">Telefonszám beírása</string> <!--History Fragment--> <string name="hist_replay_button">Visszajátszás</string> <string name="hist_replay_button_stop">Megállítás</string> - <string name="hist_no_history">Nincsenek előzmények</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">%1$s hívása</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d beszélgetés</item> @@ -62,12 +56,9 @@ <string name="notif_current_call_title">Jelenlegi hívás a következővel: %1$s</string> <string name="notif_current_call">Jelenlegi hívás</string> <!--Call Fragment--> - <string name="me">Én</string> <string name="you_txt_prefix">Ön:</string> <string name="action_call_conference">Konferencia</string> <string name="action_call_hangup">Lerak</string> - <string name="action_settings">Beállítások</string> - <string name="help_gestures">Ez a nézet különféle műveletek intézését segíti elő hívások közben. A különböző műveletek le lesznek írva; Hosszan tart, pöccint, oldalra húz stb.</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> <string name="hist_out_call">Kimenő hívás ennyi ideje: %1$s</string> @@ -89,7 +80,6 @@ <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> - <string name="permission_write_denied">Az alkalmazás nem kapott engedélyt a tárhelyére való íráshoz, í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> diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml index e9892daa0b283471a95b5fecee45b91e9f1fd671..d64fe49d1127c470073bae4a2c3b7a2f650f7414 100644 --- a/ring-android/app/src/main/res/values-hu/strings_account.xml +++ b/ring-android/app/src/main/res/values-hu/strings_account.xml @@ -31,6 +31,5 @@ <!--TLS Details--> <string name="account_rtp_port_range">Hang RTP port korlát</string> <!--restore/backup--> - <string name="account_export">Exportálás</string> <!--Name registration--> </resources> 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 0b0731aa8fb9963316c5decbbcf4f6b8efaff29a..ddf5dc3abc0c02525ca9b594115a7cfe0293cced 100644 --- a/ring-android/app/src/main/res/values-id/strings.xml +++ b/ring-android/app/src/main/res/values-id/strings.xml @@ -14,7 +14,6 @@ <!--TransferDFragment--> <!--Notifications--> <!--Call Fragment--> - <string name="me">Saya</string> <!--Text messages--> <!--MediaPreferenceFragment--> <string name="ringtone_error_title">Eror</string> 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 17808c2dd0abbd0fbef07663e831878e69c8e838..e27c0efa7440630e9a9dea7232a696db793745d9 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 @@ -6,11 +6,9 @@ <string name="contribute_section">Contributi</string> <string name="version_section">Versione</string> <!--RingActivity--> - <string name="title_section0">Componi</string> <string name="error_no_network">Assenza di connessione di rete</string> <!--AB menus--> <string name="ab_account_creation">Nuovo account</string> - <string name="ab_account_edition_1">Cancella</string> <string name="ab_action_chat">Messaggiare</string> <!--Left Drawer--> <!--Accessibility--> @@ -18,12 +16,9 @@ <string name="menu_item_home">Home</string> <string name="menu_item_settings">Opzioni</string> <!--Dialing Fragment--> - <string name="dial_action_call">Chiamata</string> <string name="dial_number">Chiama un numero</string> - <string name="dial_hint">Digita un numero di telefono</string> <!--History Fragment--> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">Nessuna cronologia</string> <!--DetailsHistory Fragment--> <!--Home Fragment--> <string name="home_transfer_complet">Trasferimento completato</string> @@ -38,10 +33,8 @@ <string name="notif_incoming_call">Chiamata in ingresso</string> <string name="notif_current_call">Chiamata corrente</string> <!--Call Fragment--> - <string name="me">Io</string> <string name="you_txt_prefix">Tu:</string> <string name="action_call_conference">Conferenza</string> - <string name="action_settings">Opzioni</string> <string name="ab_action_speakerphone">Attiva l\'audio</string> <string name="ab_action_contact_add">Aggiungi alla rubrica</string> <string name="ab_action_contact_add_question">Aggiungi alla rubrica?</string> 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 41de3c28723994574f0efb936791d35e3d01255c..31ee8e2180c45e8e5591275c6d9e3a513101da8d 100644 --- a/ring-android/app/src/main/res/values-it/strings.xml +++ b/ring-android/app/src/main/res/values-it/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Applicazione email non trovata, installane una per inviarci un rapporto</string> <string name="email_chooser_title">Mandaci un\'email usando...</string> <!--RingActivity--> - <string name="title_section0">Chiama</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Cancella</string> <string name="ab_action_chat">Messaggio di testo</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Impostazioni</string> <string name="menu_item_about">Info su Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Chiama</string> <string name="dial_number">Chiama un numero</string> - <string name="dial_hint">Digita un numero</string> <!--History Fragment--> <string name="hist_replay_button">Ripeti</string> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">Cronologia vuota</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Chiama %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Conversazione</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">Chiamata in corso con %1$s</string> <string name="notif_current_call">Chiamata attiva</string> <!--Call Fragment--> - <string name="me">Io</string> <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="action_settings">Impostazioni</string> - <string name="help_gestures">Questa finestra aiuta gli utenti consentendo multiple interazioni durante le chiamate. Le interazioni multiple sono qui descritte; Pressione prolungata, fling, swipe, ecc.</string> <string name="ongoing_call">Chiamata in corso</string> <string name="hist_in_call">Chiamata in arrivo di %1$s</string> <string name="hist_out_call">Chiamata a %1$s</string> @@ -90,7 +81,6 @@ <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> - <string name="permission_write_denied">L\'app non ha permessi di scrittura sulla 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> 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 3efc2ac8c6459fbcff732c6e5d298742a6a944f8..619517faefc5598e273f003329ccf185550b5b59 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 @@ -13,12 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Si sta per creare un account SIP con un nome host non valido. Sara solo possibile fare e ricevere chiamate ip dirette. Si potra modificare questo account più tardi.</string> - <string name="help_ring_title">Creare un account Ring</string> <string name="help_ring">Un account Ring permette di raggiungere persone in modo sicuro, in peer to peer attraverso una rete completamente distribuita</string> <string name="help_sip_title">Aggiungere il suo account SIP</string> <string name="help_sip">Importare un account SIP esistente</string> <string name="create_sip_account">Aggiungiare</string> - <string name="share_number">Condividere il numero</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Rimuovere l\'account?</string> <string name="account_delete_dialog_message">Questa azione è irreversibilie.</string> @@ -67,7 +65,6 @@ Si potra modificare questo account più tardi.</string> <string name="account_credentials_add">Aggiungere dati d\'identificazione</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Sicurezza</string> - <string name="account_srtp_deactivated">Disattivato</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Usare il trasporto TLS</string> @@ -86,17 +83,12 @@ 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_backup_message">Salvare le impostazioni dell\'account et gli identificanti con la password cifrata.</string> - <string name="account_backup_new_password">Nuovo password</string> - <string name="account_backup_confirm_password">Confermare password</string> <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="backup_failed_dialog_msg">C\'è stato un errore</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="account_export">Esportare</string> <string name="account_export_end_error_title">Errore</string> <string name="account_new_button">Creare un account Ring</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-it/strings_content_description.xml b/ring-android/app/src/main/res/values-it/strings_content_description.xml index af1ba1da5779246bf5ddd83409ba6040856cc2d9..f172bf0af413a47f7b8f59eeab25cdf228f9e5e8 100644 --- a/ring-android/app/src/main/res/values-it/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-it/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Chiamata veloce</string> <string name="contact_picture_description">Foto del contatto</string> <string name="dial_numeric_pad">Tastiera numerica</string> - <string name="dial_alphabetic_pad">Tastiera alfabetica</string> </resources> diff --git a/ring-android/app/src/main/res/values-land/dimens.xml b/ring-android/app/src/main/res/values-land/dimens.xml index cc35b2106358c2c2a9ec1812a2d803a5754b6df4..e323d34ad7a0fab23db8bb5b0632881dd8a9b69a 100644 --- a/ring-android/app/src/main/res/values-land/dimens.xml +++ b/ring-android/app/src/main/res/values-land/dimens.xml @@ -20,6 +20,4 @@ along with this program; if not, write to the Free Software --> <resources> - <dimen name="action_bar_title_margin_bottom">12dp</dimen> - </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 d65d79e2268e0252ea9d3c20bdef715a80a561ef..87c867a32008dd3208d837306ec2493e2673c6a8 100644 --- a/ring-android/app/src/main/res/values-lt/strings.xml +++ b/ring-android/app/src/main/res/values-lt/strings.xml @@ -11,7 +11,6 @@ <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_account_edition_1">Ištrinti</string> <string name="ab_action_chat">Tekstinis susirašinėjimas</string> <!--Left Drawer--> <!--Accessibility--> @@ -23,7 +22,6 @@ <string name="menu_item_settings">Nustatymai</string> <string name="menu_item_about">Apie Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Skambutis</string> <!--History Fragment--> <string name="hist_replay_button_stop">Stabdyti</string> <!--DetailsHistory Fragment--> @@ -47,10 +45,8 @@ <string name="notif_current_call_title">Esamas skambutis su %1$s</string> <string name="notif_current_call">Esamas skambutis</string> <!--Call Fragment--> - <string name="me">Aš</string> <string name="you_txt_prefix">Jūs:</string> <string name="action_call_hangup">Padėti ragelį</string> - <string name="action_settings">Nustatymai</string> <string name="ongoing_call">Esamas skambutis</string> <string name="hist_in_call">%1$s gaunamasis skambutis</string> <string name="hist_out_call">%1$s išsiunčiamasis skambutis</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 5055dd32cb97eca1253c5648be9402ac161dfe3d..e2cce6a579f141f5c8c7f53932fb252a4caa5796 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 @@ -13,11 +13,6 @@ <string name="dialog_warn_ip2ip_account_message">Jūs ruošiatės sukurti SIP paskyrą, nenurodę teisingo kompiuterio vardo. Jūs galėsite atlikti ir priimti tik tiesioginius ip skambučius. Vėliau, galėsite pataisyti savo paskyros informaciją</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Sukurti Ring paskyrą</string> <string name="help_sip_title">Pridėti savo SIP paskyrą</string> <string name="help_sip">Konfigūruokite esamą SIP paskyrą.</string> <string name="create_sip_account">Pridėti</string> @@ -87,17 +82,12 @@ 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_backup_message">Įrašykite paskyros nustatymus ir prisijungimo duomenis, užšifruotus slaptažodžiu.</string> - <string name="account_backup_new_password">Naujas slaptažodis</string> - <string name="account_backup_confirm_password">Patvirtinkite slaptažodį</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="restore_backup_wait">Prašome palaukti...</string> - <string name="backup_failed_dialog_msg">Įvyko klaida</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_msg">Įvyko klaida</string> - <string name="account_export">Eksportuoti</string> <string name="account_export_end_error_title">Klaida</string> <string name="account_new_button">Sukurti Ring paskyrą</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-lt/strings_content_description.xml b/ring-android/app/src/main/res/values-lt/strings_content_description.xml index d032439d2babde34a42be4b4b13ab7f799bfd0b5..22c01e86e6c2258d506b0aba5d5a84c3e84ab662 100644 --- a/ring-android/app/src/main/res/values-lt/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-lt/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Greitasis skambutis</string> <string name="contact_picture_description">Kontakto paveikslas</string> <string name="dial_numeric_pad">Skaitmeninė klaviatūra</string> - <string name="dial_alphabetic_pad">Raidinė klaviatūra</string> </resources> 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 2a8f523e346ec7dfeda68c25e4634ae3e4db8b55..f40ac71da82ed342022fd4d6dff7cf0fef07a897 100644 --- a/ring-android/app/src/main/res/values-nb/strings.xml +++ b/ring-android/app/src/main/res/values-nb/strings.xml @@ -8,12 +8,10 @@ <string name="no_email_app_installed">Fant ingen epost-app. Installer en for å sende oss en rapport</string> <string name="email_chooser_title">Send epost vha...</string> <!--RingActivity--> - <string name="title_section0">Slå nummer</string> <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_account_edition_1">Slett</string> <string name="ab_action_chat">Tekstmelding</string> <!--Left Drawer--> <!--Accessibility--> @@ -25,14 +23,10 @@ <string name="menu_item_settings">Innstillinger</string> <string name="menu_item_about">Om Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Ring</string> <string name="dial_number">Slå et nummer</string> - <string name="dial_hint">Skriv inn telefonnummer</string> <!--History Fragment--> <string name="hist_replay_button_stop">Stopp</string> - <string name="hist_no_history">Ingen historikk</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Ring %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d samtale</item> @@ -60,12 +54,10 @@ <string name="notif_current_call_title">Pågående samtale med %1$s</string> <string name="notif_current_call">Pågående samtale</string> <!--Call Fragment--> - <string name="me">Meg</string> <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="action_settings">Innstillinger</string> <string name="ongoing_call">Pågående samtale</string> <string name="hist_in_call">Innkommende samtale med %1$s</string> <string name="hist_out_call">Utgående samtale med %1$s</string> @@ -87,7 +79,6 @@ <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> - <string name="permission_write_denied">Denne app-en fikk ikke lov til å skrive til 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> 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 102ba7836d8fbaf4ef4f57cc6fdf1fe375d9e566..e7c9aa5af4b40b63ab15ce8402fa846f71152536 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 @@ -13,16 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Du er igang med å lage en SIP-konto uten et gyldig vertsnavn. Du vil kun være i stand til å gjennomføre direkte IP-samtaler. Du kan endre kontoen din senere</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Opprett en Ring-konto</string> <string name="help_ring">En Ring-konto lar deg na folk på sikkert via mellom likemenn via et fullstendig distribuert nettverk.</string> <string name="help_sip_title">Legg til SIP-kontoen din</string> <string name="help_sip">Sett opp en eksisterende SIP-konto.</string> <string name="create_sip_account">Legg til</string> - <string name="share_number">Del nummer</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Slett konto?</string> <string name="account_delete_dialog_message">Denne handlingen kan ikke gjøres om.</string> @@ -68,7 +62,6 @@ Du kan endre kontoen din senere</string> <!--Security Details--> <!--SRTP Details--> <string name="account_preferences_security_tab">Sikkerhet</string> - <string name="account_srtp_deactivated">Avslått</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Bruk TLS-transport</string> @@ -87,16 +80,12 @@ 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_backup_new_password">Nytt passord</string> - <string name="account_backup_confirm_password">Bekreft passord</string> <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="backup_failed_dialog_msg">Det skjedde en feil</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="account_export">Eksporter</string> <string name="account_export_end_error_title">Feil</string> <string name="account_new_button">Opprett en Ring-konto</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-nb/strings_content_description.xml b/ring-android/app/src/main/res/values-nb/strings_content_description.xml index 7bc6f8afb3ab218973460a78d1cbfb216a1cde9d..3a3dd8c2d996114b2c2e76416cfcc5d1af413c2b 100644 --- a/ring-android/app/src/main/res/values-nb/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-nb/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Kjapp samtale</string> <string name="contact_picture_description">Kontaktbilde</string> <string name="dial_numeric_pad">Numerisk tasteflate</string> - <string name="dial_alphabetic_pad">Alfabetisk tasteflate</string> </resources> 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 1a60eee69713aea71c55ee3b3c08d504f9bc905a..38bd9191c19cf6db3fc54ca5b2026297604d963a 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="error_no_network">Geen netwerkverbinding</string> <!--AB menus--> <string name="ab_account_creation">Nieuw account</string> - <string name="ab_account_edition_1">Verwijderen</string> <!--Left Drawer--> <!--Accessibility--> <!--Sections--> @@ -18,13 +17,10 @@ <string name="menu_item_settings">Instellingen</string> <string name="menu_item_about">Over Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Bellen</string> <!--History Fragment--> <string name="hist_replay_button">Opnieuw afspelen</string> <string name="hist_replay_button_stop">Stoppen</string> - <string name="hist_no_history">Geen geschiedenis</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Bel %1$s</string> <!--Home Fragment--> <!--ContactList Fragment--> <string name="no_contact_found">Geen contact gevonden</string> @@ -37,7 +33,6 @@ <!--Notifications--> <!--Call Fragment--> <string name="action_call_hangup">Ophangen</string> - <string name="action_settings">Instellingen</string> <string name="ab_action_contact_add">Voeg toe aan contacten</string> <!--Text messages--> <!--MediaPreferenceFragment--> diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml index 903952a422e8941df261fc5f0c6ec1fbcc2ea4b6..f902a3ce6b8fd864e5c7e93c91e2b5f06e996a79 100644 --- a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml +++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml @@ -8,7 +8,6 @@ <string name="dialog_wait_create">Account aan het toevoegen</string> <string name="help_sip_title">Voeg je SIP account toe</string> <string name="create_sip_account">Toevoegen</string> - <string name="share_number">Telefoonnummer delen</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Account verwijderen?</string> <string name="account_delete_dialog_message">Deze actie kan niet ongedaan worden</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 3c814a2465e52fadeecda8e97143a878d1c1a2f6..518b1ff59d2193b7748d2ee497501707154b2db5 100644 --- a/ring-android/app/src/main/res/values-nl/strings.xml +++ b/ring-android/app/src/main/res/values-nl/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Geen e-mailapplicatie gevonden, installeer er een om ons een rapport te kunnen sturen</string> <string name="email_chooser_title">E-mail versturen met...</string> <!--RingActivity--> - <string name="title_section0">Kiezen</string> <string name="title_activity_sflphone_home">Ring</string> <string name="error_no_network">Geen netwerkverbinding</string> <string name="error_mobile_network_available_but_disabled">Geef toegang tot mobiel netwerk in de instellingen.</string> <!--AB menus--> <string name="ab_account_creation">Account aanmaken</string> - <string name="ab_account_edition_1">Verwijderen</string> <string name="ab_action_chat">Tekstberichten</string> <!--Left Drawer--> <!--Accessibility--> @@ -27,15 +25,11 @@ <string name="menu_item_share">Deel mijn contact</string> <string name="menu_item_about">Over Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Oproep</string> <string name="dial_number">Kies een nummer</string> - <string name="dial_hint">Geef een telefoonnummer in</string> <!--History Fragment--> <string name="hist_replay_button">Opnieuw afspelen</string> <string name="hist_replay_button_stop">Stoppen</string> - <string name="hist_no_history">Geen geschiedenis</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">%1$s bellen</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d gesprek</item> @@ -63,13 +57,10 @@ <string name="notif_current_call_title">Huidige oproep met %1$s</string> <string name="notif_current_call">Huidige oproep</string> <!--Call Fragment--> - <string name="me">Ik</string> <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="action_settings">Instelllingen</string> - <string name="help_gestures">Dit scherm helpt gebruikers met de verschillende interacties tijdens oproepen. Verschillende acties worden beschreven; Lang aanraken; fling, swype etc.</string> <string name="ongoing_call">Lopende oproep</string> <string name="hist_in_call">Inkomende oproep van %1$s</string> <string name="hist_out_call">Uitgaande oproep van %1$s</string> @@ -91,7 +82,6 @@ <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 alsnog toe te kennen</string> - <string name="permission_write_denied">De applicatie heeft geen machtiging om naar je opslag te schrijven en kan daardoor niet correct functioneren. Gelieve te overwegen deze machtiging alsnog 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> @@ -122,8 +112,6 @@ <string name="account_create_title">Een Ring-account aanmaken</string> <string name="prompt_new_username">Voer nieuwe gebruikersnaam in</string> <string name="help_password_choose">Kies een sterk wachtwoord om je Ring-account te beschermen.</string> - <string name="btn_use_existing_account">Gebruik een reeds bestaande Ring-account</string> - <string name="btn_create_account">Maak een nieuwe account aan</string> <string name="help_password_enter">Voer hoofdwachtwoord van je Ring-account in</string> <string name="help_pin_enter">Voer de PIN-code van een andere geconfigureerde Ring-account in. Gebruik de \"account exporteren op Ring\"-functie om een PIN-code te verkrijgen.</string> <string name="account_device_updated_message">Je Ring-account is met succes bijgewerkt.</string> @@ -135,7 +123,6 @@ <string name="unknowm_if_empty">Onbekend wanneer leeg</string> <string name="unknown">Onbekend</string> <!--Share fragment--> - <string name="share_label">Tik op de Ring-ID om te delen</string> <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_your_account_information">Deel mijn contactinformatie</string> </resources> 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 fd3c0e4ecc1df1efcb66f98ab5198f01d549111d..37f98fdc8f8d175fbf37433e1fbc9c931f6a742e 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 @@ -16,16 +16,10 @@ <string name="dialog_warn_ip2ip_account_message">Je staat op het punt een SIP-account zonder geldige hostnaam toe te voegen. Je zal er enkel directe IP-oproepen mee kunnen maken en ontvangen. Je kan je account later bewerken</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Een Ring-account aanmaken</string> <string name="help_ring">Een Ring-account stelt je in staat andere mensen veilig te bereiken in peer-to-peer middels een volledig gedistribueerd netwerk.</string> <string name="help_sip_title">Je SIP-account toevoegen</string> <string name="help_sip">Een bestaande SIP-account configureren</string> <string name="create_sip_account">Toevoegen</string> - <string name="share_number">Nummer delen</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Account verwijderen?</string> <string name="account_delete_dialog_message">Handeling kan niet ongedaan gemaakt worden.</string> @@ -35,7 +29,6 @@ Je kan je account later bewerken</string> <string name="normal_devices_titles">Bekende apparaten gekoppeld aan deze Ring-account</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Algemeen</string> - <string name="account_preferences_devices_tab">Apparaten</string> <string name="account_basic_category">Basisinstellingen</string> <string name="account_alias_label">Accountnaam</string> <string name="account_hostname_label">Hostnaam</string> @@ -77,7 +70,6 @@ Je kan je account later bewerken</string> <string name="account_credentials_add">Legitimatie toevoegen</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Beveiliging</string> - <string name="account_srtp_deactivated">Uitgeschakeld</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">TLS-transport gebruiken</string> @@ -96,35 +88,18 @@ 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_backup">Reservekopie</string> <string name="account_restore_account">Een account herstellen</string> - <string name="account_backup_title">Reservekopie van account maken</string> - <string name="account_restore_title">Accounts herstellen</string> - <string name="account_restore_explanation">Je kan accounts herstellen met een reservekopie</string> - <string name="account_backup_message">Accountinstellingen, legitimatie en wachtwoord versleuteld opslaan.</string> - <string name="account_backup_new_password">Nieuw wachtwoord</string> - <string name="account_backup_confirm_password">Bevestig wachtwoord</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">Nieuw apparaat toevoegen</string> - <string name="account_new_device_message">Ontgrendel Ring-account om een nieuw apparaat te koppelen.</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="backup_dialog_title">Reservekopie van account maken</string> - <string name="account_backup_result">Reservekopie opgeslagen in %1$s</string> - <string name="backup_failed_dialog_title">Reservekopie maken mislukt</string> - <string name="backup_failed_dialog_msg">Er is een fout opgetreden</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="account_export">Exporteren</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_pin_title">PIN-code:</string> - <string name="account_export_end_pin_message">Je kan deze PIN-code samen met het hoofdwachtwoord van je account gedurende 10 minuten gebruiken om een nieuw apparaat aan je Ring-account te koppelen.</string> - <string name="account_export_end_decryption_title">Ontsleutelingsfout</string> <string name="account_export_end_decryption_message">Kon je account niet ontgrendelen met het opgegeven wachtwoord.</string> <string name="account_export_end_network_title">Netwerkfout</string> <string name="account_export_end_network_message">Kon account niet exporteren over het netwerk. Controleer je netwerkverbinding.</string> @@ -141,7 +116,6 @@ Je kan je account later bewerken</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_creation_error">Fout bij aanmaken van account</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_no_network_title">Kan geen verbinding maken met het netwerk</string> @@ -151,12 +125,9 @@ Je kan je account later bewerken</string> <string name="account_device_updated_title">Accountapparaat bijgewerkt</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_password">Voer je wachtwoord in</string> <string name="account_link_prompt_pin">Voer PIN-code in</string> <string name="account_wizard_title">Ring-account</string> <string name="account_new_button">Een Ring-account aanmaken</string> - <string name="account_link_infos">Om een ander apparaat aan deze account te koppelen moet je eerst een PIN-code verkrijgen. Ga om de PIN-code te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die je wil gebruiken en selecteer \"Een ander apparaat aan deze account koppelen\".</string> - <string name="account_new_infos">Kies een wachtwoord met minimaal 6 tekens. Dit wachtwoord wordt gevraagd wanneer je nieuwe apparaten aan je Ring-account toevoegt.</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> <string name="account_start_export_button">PIN-code genereren</string> diff --git a/ring-android/app/src/main/res/values-nl/strings_content_description.xml b/ring-android/app/src/main/res/values-nl/strings_content_description.xml index 69aa01273d88d235038c05ba597cbdabc0f1e4c9..3de32c31da3615ba963f70a266d51d89442bd0fb 100644 --- a/ring-android/app/src/main/res/values-nl/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-nl/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Snel bellen</string> <string name="contact_picture_description">Contactfoto</string> <string name="dial_numeric_pad">Numeriek toetsenbord</string> - <string name="dial_alphabetic_pad">Alfabetisch toetsenbord</string> </resources> 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 3fb82ea270bdb7764c377f20fffec6696558c674..27b414c409aab81b2184f61edd9b106dbf5a9d7c 100644 --- a/ring-android/app/src/main/res/values-pa/strings.xml +++ b/ring-android/app/src/main/res/values-pa/strings.xml @@ -4,14 +4,12 @@ <string name="title_activity_sflphone_home">ਰਿੰਗ</string> <!--AB menus--> <string name="ab_account_creation">ਨਵਾਂ ਖਾਤਾ</string> - <string name="ab_account_edition_1">ਮਿਟਾਓ</string> <!--Left Drawer--> <!--Accessibility--> <!--Sections--> <string name="menu_item_settings">ਸੈਟਿੰਗ</string> <string name="menu_item_about">ਰਿੰਗ ਬਾਰੇ</string> <!--Dialing Fragment--> - <string name="dial_hint">ਫੋਨ ਨੰਬਰ ਮਿਲਾਓ</string> <!--History Fragment--> <!--DetailsHistory Fragment--> <!--Home Fragment--> @@ -21,7 +19,6 @@ <!--TransferDFragment--> <!--Notifications--> <!--Call Fragment--> - <string name="action_settings">ਸੈਟਿੰਗ</string> <!--Text messages--> <!--MediaPreferenceFragment--> <!--Read contacts permission--> diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml index 58d13b2343b19add534691f8334044dc76daee9b..1f676790dea020c0617574d5c84d8f20a7d007ad 100644 --- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml +++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml @@ -3,7 +3,6 @@ <!--RingActivity--> <string name="title_activity_sflphone_home">Ring</string> <!--AB menus--> - <string name="ab_account_edition_1">Usun</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 cfd6283312abe8a78c1038bd2de728f2f5286300..6ac37e8efda6ccdaae11cba5dffab69a639d7dcb 100644 --- a/ring-android/app/src/main/res/values-pl/strings.xml +++ b/ring-android/app/src/main/res/values-pl/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Nie znaleziono aplikacji e-mail. Zainstaluj jedną aby wysłać nam raport.</string> <string name="email_chooser_title">Wyślij e-mail używając...</string> <!--RingActivity--> - <string name="title_section0">Wykręć</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Usuń</string> <string name="ab_action_chat">Tekstowe powiadamiania</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Ustawienia</string> <string name="menu_item_about">o Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Dzwoń</string> <string name="dial_number">Wykręć numer</string> - <string name="dial_hint">Wpisz numer telefonu</string> <!--History Fragment--> <string name="hist_replay_button">Powtórz</string> <string name="hist_replay_button_stop">Zatrzymaj</string> - <string name="hist_no_history">Brak histori</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Zadzwoń do %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Rozmowa</item> @@ -63,13 +57,10 @@ <string name="notif_current_call_title">Aktualna rozmowa z %1$s</string> <string name="notif_current_call">Aktualna rozmowa</string> <!--Call Fragment--> - <string name="me">Ja</string> <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="action_settings">Ustawienia</string> - <string name="help_gestures">Ten widok pomaga użytkownikom z różnymi interakcjami podczas rozmów. Różne akcje będą opisane; Przytrzymaj, przeciągnij, itd.</string> <string name="ongoing_call">Trwa połączenie</string> <string name="hist_in_call">Czas przychodzączego połączenia: %1$s</string> <string name="hist_out_call">Czas wychodzączego połączenia: %1$s</string> @@ -91,7 +82,6 @@ <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> - <string name="permission_write_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> 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 14b2adf559fedbc4ead9e359f0aec00a2af21221..52f816c9f59a18eb715e9ca40907dd6c56ab4c80 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 @@ -13,16 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Zamierzasz założyć konto SIP bez prawidłowego hosta. Będziesz mógł nawiązywać i odbierać połączenia wyłącznie od bezpośrednich adresów IP. Możesz edytować swoje konto później</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Stwórz konto Ring</string> <string name="help_ring">Konto Ring pozwala Ci na dotarcie do ludzi bezpośrednio za pomocą sieci peer to peer w sieci całkowicie rozdzielonej.</string> <string name="help_sip_title">Dodaj twoje konto SIP</string> <string name="help_sip">Skonfiguruj istniejące konto SIP.</string> <string name="create_sip_account">Dodaj</string> - <string name="share_number">Podziel się numerem</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Usuń konto ?</string> <string name="account_delete_dialog_message">Tego działania nie można cofnąć.</string> @@ -71,7 +65,6 @@ Możesz edytować swoje konto później</string> <string name="account_credentials_add">Dodaj detale</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Zabezpieczenia</string> - <string name="account_srtp_deactivated">Wyłączone</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Korzystaj z transportu TLS</string> @@ -90,17 +83,12 @@ 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_backup_message">Zapisz ustawienia konta i detale, oraz szyfrowane hasło.</string> - <string name="account_backup_new_password">Nowe hasło</string> - <string name="account_backup_confirm_password">Potwierdź hasło</string> <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="backup_failed_dialog_msg">Wystąpił błąd</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="account_export">Wyeksportuj</string> <string name="account_export_end_error_title">Błąd</string> <string name="account_new_button">Stwórz konto Ring</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-pl/strings_content_description.xml b/ring-android/app/src/main/res/values-pl/strings_content_description.xml index 10c435c72493c15e4568fbed0aa50e65a0887f7a..c596ee849820b1c654a2a1e2f86fcc0afd6931f9 100644 --- a/ring-android/app/src/main/res/values-pl/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-pl/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Szybkie Połączenie</string> <string name="contact_picture_description">Zdjęcie Kontaktu</string> <string name="dial_numeric_pad">Klawiatura numeryczna</string> - <string name="dial_alphabetic_pad">Klawiatura alfabetyczna</string> </resources> 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 dee50053bf70081366290c831150267d5a5de696..ef8c95d98bebce693afe420b0db9e75424d075d7 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 @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Aplicação de e-mail não encontrada. Instale uma para nos enviar um relatório de erros.</string> <string name="email_chooser_title">Enviar e-mail usando...</string> <!--RingActivity--> - <string name="title_section0">Discar</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Deletar</string> <string name="ab_action_chat">Mensagens de texto</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Configurações</string> <string name="menu_item_about">Sobre o Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Chamar</string> <string name="dial_number">Disque um número</string> - <string name="dial_hint">Digite um número de telefone</string> <!--History Fragment--> <string name="hist_replay_button">Repetir</string> <string name="hist_replay_button_stop">Parar</string> - <string name="hist_no_history">Sem histórico</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Ligação %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Conversa</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">Chamada atual com %1$s</string> <string name="notif_current_call">Chamada atual</string> <!--Call Fragment--> - <string name="me">Eu</string> <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="action_settings">Configurações</string> - <string name="help_gestures">Esta visão irá ajudar os usuários com diferentes interações durante as chamadas. Serão descritas diferentes ações como; Clique longo, fling, Swype etc.</string> <string name="ongoing_call">Chamada em andamento</string> <string name="hist_in_call">Recebimento de chamada %1$s</string> <string name="hist_out_call">Chamada de saída %1$s</string> @@ -90,7 +81,6 @@ <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> - <string name="permission_write_denied">Não foi permitido alterar 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> 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 19dc738ed395033aa23f4975d3a91b2fc2bf905e..e026229389963d087511242b09b015f6ecabfea1 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 @@ -15,16 +15,10 @@ <string name="dialog_warn_ip2ip_account_message">Você está prestes a criar uma conta SIP com nenhum nome de host válido. Você só será capaz de fazer e receber chamadas IP diretos. Você pode editar sua conta depois.</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Criar uma conta no Ring</string> <string name="help_ring">Uma conta do Ring permite que você entre em contato com pessoas de forma segura em uma rede peer-to-peer totalmente distribuída.</string> <string name="help_sip_title">Adicionar sua conta SIP</string> <string name="help_sip">Configurar uma conta SIP existente.</string> <string name="create_sip_account">Adicionar</string> - <string name="share_number">Compartilhar o número</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Deletar conta?</string> <string name="account_delete_dialog_message">Esta ação não pode ser revista.</string> @@ -34,7 +28,6 @@ Você pode editar sua conta depois.</string> <string name="normal_devices_titles">Dispositivos conhecidos conectados à esta conta Ring</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Geral</string> - <string name="account_preferences_devices_tab">Dispositivos</string> <string name="account_basic_category">Configurações básicas</string> <string name="account_alias_label">Nome da conta</string> <string name="account_hostname_label">Servidor</string> @@ -75,7 +68,6 @@ Você pode editar sua conta depois.</string> <string name="account_credentials_add">Adicionar credenciais</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Segurança</string> - <string name="account_srtp_deactivated">Desativado</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Use transporte TLS</string> @@ -94,24 +86,14 @@ 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_backup_message">Salvar configurações de conta e credenciais, senha criptografada.</string> - <string name="account_backup_new_password">Nova senha</string> - <string name="account_backup_confirm_password">Confirmar senha</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">Adicionar novo dispositivo</string> - <string name="account_new_device_message">Desbloquear conta Ring para associar novo dispositivo.</string> <string name="restore_backup_wait">Por favor, aguarde...</string> - <string name="backup_failed_dialog_msg">Um erro ocorreu</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_msg">Um erro ocorreu</string> - <string name="account_export">Exportar</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_pin_title">PIN :</string> - <string name="account_export_end_pin_message">Use este PIN junto com a senha de sua conta principal para conectar seu novo dispositivo à sua conta Ring dentro dos próximos 10 minutos.</string> - <string name="account_export_end_decryption_title">Erro de decriptação</string> <string name="account_export_end_decryption_message">Não foi possível desbloquear sua conta utilizando a senha fornecida.</string> <string name="account_export_end_network_title">Erro de rede</string> <string name="account_export_end_network_message">Não foi possível exportar a conta na rede. Verifique sua conexão.</string> @@ -128,7 +110,6 @@ Você pode editar sua conta depois.</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_creation_error">Erro ao criar conta</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_no_network_title">Não foi possível conectar-se à rede.</string> diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml index e290cc8219cda53151c861e528a46ff15d7d9900..f4dd8131e4eb81fc98c9f5c2858e7bb3d6dfeb17 100644 --- a/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Chamada Rápida</string> <string name="contact_picture_description">Imagem de Contato</string> <string name="dial_numeric_pad">Teclado de discagem Numérico</string> - <string name="dial_alphabetic_pad">Teclado de discagem Alfabético</string> </resources> 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 e899c58af07155fc1049d8c4f976c20bdcd7aa0b..64481d9abd9076222a8daf15acb5be39688b5617 100644 --- a/ring-android/app/src/main/res/values-pt/strings.xml +++ b/ring-android/app/src/main/res/values-pt/strings.xml @@ -7,7 +7,6 @@ <!--Sections--> <string name="menu_item_settings">Configurações</string> <!--Dialing Fragment--> - <string name="dial_action_call">Chamada</string> <!--History Fragment--> <!--DetailsHistory Fragment--> <!--Home Fragment--> @@ -17,7 +16,6 @@ <!--Notifications--> <string name="notif_incoming_call">Chamada entrante</string> <!--Call Fragment--> - <string name="action_settings">Configurações</string> <string name="ab_action_contact_add">Add to contacts</string> <!--Text messages--> <!--MediaPreferenceFragment--> 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 5b68ce3f0f1c8624c6e24b916110d8976498f828..2811e1773ee3fd2eb46621ae08978a378edfd875 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 @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Не найдено приложение электронной почты. Пожалуйста, установите его для отправки нам отчета.</string> <string name="email_chooser_title">Отправить почту, используя...</string> <!--RingActivity--> - <string name="title_section0">Вызвать</string> <string name="title_activity_sflphone_home">Звонок</string> <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_account_edition_1">Удалить</string> <string name="ab_action_chat">Тестовое сообщение</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Настройки</string> <string name="menu_item_about">О Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Вызов</string> <string name="dial_number">Набрать номер</string> - <string name="dial_hint">Ввод телефонного номера</string> <!--History Fragment--> <string name="hist_replay_button">Ответ</string> <string name="hist_replay_button_stop">Стоп</string> - <string name="hist_no_history">Отсутствует история</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Вызовы %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Беседа</item> @@ -64,13 +58,10 @@ <string name="notif_current_call_title">Текущий вызов от %1$s</string> <string name="notif_current_call">Текущий вызов</string> <!--Call Fragment--> - <string name="me">Мне</string> <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="action_settings">Настройки</string> - <string name="help_gestures">Эта вид поможет пользователям взаимодействовать во время телефонного разговора. Различные действия будут доступны: Длительное нажатие, интрижка, Swype и т.д.</string> <string name="ongoing_call">Текущий вызов</string> <string name="hist_in_call">Входящий вызов от %1$s</string> <string name="hist_out_call">Исходящий вызов от %1$s</string> @@ -92,7 +83,6 @@ <string name="message_sending">Отправка сообщения...</string> <string name="time_just_now">В данный момент</string> <string name="permission_read_denied">Приложение не имеет прав чтения с накопителя, потому не может функционировать правильно. Пожалуйста, добавьте права доступа к хранилищу данных.</string> - <string name="permission_write_denied">Приложение не имеет прав записи в накопитель, потому не может функционировать правильно. Пожалуйста, добавьте права доступа к хранилищу данных.</string> <!--MediaPreferenceFragment--> <string name="permission_dialog_camera_title">Разрешение на использование камеры</string> <string name="permission_dialog_camera_message">Необходимо доступ к камере для работы с видеозвонками. Пожалуйста, предоставьте их.</string> 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 c96b917ee0449bd752d8f46358918080f237c010..8fed27f616b47f29887c75c12d8f050df03e28c0 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 @@ -10,12 +10,10 @@ <string name="dialog_wait_create">Добавление аккаунта</string> <string name="dialog_wait_create_details">Пожалуйста, подождите, пока Ваш новый аккаунт будет добавлен...</string> <string name="dialog_warn_ip2ip_account_title">Создать пустой SIP аккаунт?</string> - <string name="help_ring_title">Создать Ring аккаунт</string> <string name="help_ring">Ring аккаунт позволяет безопасно связываться между людьми через полностью распределенную сеть.</string> <string name="help_sip_title">Добавить SIP аккаунт</string> <string name="help_sip">Настройка существующего SIP аккаунта</string> <string name="create_sip_account">Добавить</string> - <string name="share_number">Расшарить номер</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Удалить аккаунт?</string> <string name="account_delete_dialog_message">Это действие не может быть отменено</string> @@ -64,7 +62,6 @@ <string name="account_credentials_add">Добавить учетные данные</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Безопасность</string> - <string name="account_srtp_deactivated">Дезактивирован</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Использовать TLS</string> @@ -83,17 +80,12 @@ <string name="account_rtp_min_port">Минимум</string> <string name="account_rtp_port_range">Диапазон портов RTP</string> <!--restore/backup--> - <string name="account_backup_message">Сохранить настройки аккаунта и учетные данные, пароль в зашифрованном виде.</string> - <string name="account_backup_new_password">Новый пароль</string> - <string name="account_backup_confirm_password">Подтвердите пароль</string> <string name="account_restore_message">Введите пароль для расшифровки файла.</string> <string name="account_restore_decryption_password">Дешифрование паролья</string> <string name="restore_backup_wait">Пожалуйста, подождите...</string> - <string name="backup_failed_dialog_msg">Произошла ошибка</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="account_export">Экспорт</string> <string name="account_export_end_error_title">Ошибка</string> <string name="account_new_button">Создать Ring аккаунт</string> <!--Name registration--> 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 d1c03f8dcaee11587550af110a79687d9a528996..1897d6369ec597a4ad6f039fb137f5dfae5e6f9a 100644 --- a/ring-android/app/src/main/res/values-ru/strings.xml +++ b/ring-android/app/src/main/res/values-ru/strings.xml @@ -3,12 +3,10 @@ <string name="section_licence">Лицензия</string> <string name="version_section">Версия</string> <!--RingActivity--> - <string name="title_section0">Набрать</string> <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_account_edition_1">Удалить</string> <string name="ab_action_chat">Сообщения</string> <!--Left Drawer--> <!--Accessibility--> @@ -20,15 +18,11 @@ <string name="menu_item_settings">Настройки</string> <string name="menu_item_about">О программе</string> <!--Dialing Fragment--> - <string name="dial_action_call">Позвонить</string> <string name="dial_number">Набрать номер</string> - <string name="dial_hint">Введите номер телефона</string> <!--History Fragment--> <string name="hist_replay_button">Повторить</string> <string name="hist_replay_button_stop">Стоп</string> - <string name="hist_no_history">Без сохранения истории</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Позвонить %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Диалог</item> @@ -58,13 +52,10 @@ <string name="notif_current_call_title">Текущий вызов %1$s</string> <string name="notif_current_call">Текущий вызов</string> <!--Call Fragment--> - <string name="me">Я</string> <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="action_settings">Настройки</string> - <string name="help_gestures">Этот обзор поможет пользователям разобраться с возможностями во время звонков. Будут описаны разные действия; Длительное нажатие, бросок, скольжение и т.д.</string> <string name="ongoing_call">Исходящий вызов</string> <string name="hist_in_call">Входящий звонок %1$s</string> <string name="hist_out_call">Исходящий звонок %1$s</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 335f03d9c0cac7396cb8699e69f2042ec937306b..8e0f10968b748ed220c67598f30f0c62ee1bafde 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 @@ -11,7 +11,6 @@ <string name="dialog_wait_create_details">Ожидайте создания вашей учётной записи</string> <string name="help_sip">Настроить существующую учётную запись SIP</string> <string name="create_sip_account">Добавить</string> - <string name="share_number">Поделиться номером</string> <!--Strings related to account deletion--> <!--AccountManagementFragment--> <string name="empty_account_list">Нет зарегистрированных учётных записей</string> @@ -52,7 +51,6 @@ <string name="account_credentials_label">Полномочия</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Безопасность</string> - <string name="account_srtp_deactivated">Деактивирован</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Использовать TLS</string> diff --git a/ring-android/app/src/main/res/values-ru/strings_content_description.xml b/ring-android/app/src/main/res/values-ru/strings_content_description.xml index 3a42d25c7cb5861c441ed7e9138ae4453f9fe7ff..57127b2f8aea4f6f924da3508a6a3092a98fd487 100644 --- a/ring-android/app/src/main/res/values-ru/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-ru/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Быстрый вызов</string> <string name="contact_picture_description">Фото контакта</string> <string name="dial_numeric_pad">Цифровая клавиатура</string> - <string name="dial_alphabetic_pad">Алфавитная клавиатура</string> </resources> 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 0e2681f2a30e8929928679136493f4782ed9f75c..1203ee54dc09f0a4af72971d0187c43422fe7e4f 100644 --- a/ring-android/app/src/main/res/values-sv/strings.xml +++ b/ring-android/app/src/main/res/values-sv/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Inget e-postprogram hittades, installera ett och skicka en rapport</string> <string name="email_chooser_title">Skicka e-post med...</string> <!--RingActivity--> - <string name="title_section0">Ring upp</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Ta bort</string> <string name="ab_action_chat">Textmeddelande</string> <!--Left Drawer--> <!--Accessibility--> @@ -27,15 +25,11 @@ <string name="menu_item_share">Dela min kontakt</string> <string name="menu_item_about">Om Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Ring upp</string> <string name="dial_number">Slå ett nummer</string> - <string name="dial_hint">Ange telefonnummer</string> <!--History Fragment--> <string name="hist_replay_button">Svara</string> <string name="hist_replay_button_stop">Stopp</string> - <string name="hist_no_history">Ingen historik</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Ring %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d konversation</item> @@ -63,13 +57,10 @@ <string name="notif_current_call_title">Aktuellt samtal med %1$s</string> <string name="notif_current_call">Aktuellt samtal</string> <!--Call Fragment--> - <string name="me">Jag</string> <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="action_settings">Inställningar</string> - <string name="help_gestures">Denna vy hjälper användare med olika slags interaktioner under samtal. Olika åtgärder kommer att beskrivas, som långtryck, snärt, svep etc.</string> <string name="ongoing_call">Pågående samtal</string> <string name="hist_in_call">Inkommande samtal av %1$s</string> <string name="hist_out_call">Utgående samtal av %1$s</string> @@ -91,7 +82,6 @@ <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> - <string name="permission_write_denied">Appen nekas att skriva till din lagringsplats. Överväg att tilldela appen skrivrä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> @@ -122,8 +112,6 @@ <string name="account_create_title">Skapa ett Ring-konto</string> <string name="prompt_new_username">Ange nytt användarnamn</string> <string name="help_password_choose">Ange ett starkt lösenord, som du kommer ihåg, för att skydda ditt Ring-konto.</string> - <string name="btn_use_existing_account">Använd ett befintligt Ring-konto istället</string> - <string name="btn_create_account">Skapa nytt konto istället</string> <string name="help_password_enter">Ange ditt huvudsakliga Ring-kontos lösenord</string> <string name="help_pin_enter">Ange PIN-koden från ett annat konfigurerat Ring-konto. Använd \"Exportera konto på Ring\", för att få din PIN-kod.</string> <string name="account_device_updated_message">Du har lyckats uppdatera ditt Ring-konto.</string> @@ -135,7 +123,6 @@ <string name="unknowm_if_empty">Okänd om tom</string> <string name="unknown">Okänd</string> <!--Share fragment--> - <string name="share_label">Tryck på Ring-ID för att dela</string> <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_your_account_information">Dela min kontaktinformation</string> </resources> 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 067c0a4fb976d4f243cccecf48501f8472a9a866..57dfd72ec283a171d855a8a539ad25a53cdd7da2 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 @@ -16,16 +16,10 @@ <string name="dialog_warn_ip2ip_account_message">Du håller på att skapa ett SIP-konto utan giltigt värdnamn. Du kommer bara att kunna ringa och ta emot direkta IP-samtal. Du kan ändra kontot senare.</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Skapa ett Ring-konto</string> <string name="help_ring">Ett Ring-konto låter dig nå folk säkert via P2P, i ett fullständigt distribuerat närverk.</string> <string name="help_sip_title">Lägg till ditt SIP-konto</string> <string name="help_sip">Konfigurera ett befintligt SIP-konto.</string> <string name="create_sip_account">Lägg till</string> - <string name="share_number">Dela nummer</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Vill du ta bort kontot?</string> <string name="account_delete_dialog_message">Denna åtgärd kan inte ångras.</string> @@ -35,7 +29,6 @@ Du kan ändra kontot senare.</string> <string name="normal_devices_titles">Kända enheter, länkade till detta Ring-konto</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Allmänt</string> - <string name="account_preferences_devices_tab">Enheter</string> <string name="account_basic_category">Grundläggande inställningar</string> <string name="account_alias_label">Kontonamn</string> <string name="account_hostname_label">Värdnamn</string> @@ -77,7 +70,6 @@ Du kan ändra kontot senare.</string> <string name="account_credentials_add">Lägg till inloggningsuppgifter</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Säkerhet</string> - <string name="account_srtp_deactivated">Inaktiverad</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Använd TLS-transport</string> @@ -96,35 +88,18 @@ 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_backup">Säkerhetskopiera</string> <string name="account_restore_account">Återställ ett konto</string> - <string name="account_backup_title">Säkerhetskopiera ett konto</string> - <string name="account_restore_title">Återställ konto</string> - <string name="account_restore_explanation">Du kan återställa tidigare säkerhetskopierade konton.</string> - <string name="account_backup_message">Spara kontoinställningar och autentiseringsuppgifter, lösenordet krypterat.</string> - <string name="account_backup_new_password">Nytt lösenord</string> - <string name="account_backup_confirm_password">Bekräfta lösenord</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">Lägg till ny enhet</string> - <string name="account_new_device_message">Lås upp Ring-kontot för att associera ny enhet.</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="backup_dialog_title">Säkerhetskopiera konto</string> - <string name="account_backup_result">Säkerhetskopia sparad i %1$s</string> - <string name="backup_failed_dialog_title">Säkerhetskopiering misslyckades</string> - <string name="backup_failed_dialog_msg">Et fel inträffade</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="account_export">Exportera</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_pin_title">PIN : </string> - <string name="account_export_end_pin_message">Använd PIN-koden tillsammans med ditt kontolösenord för att associera den nya enheten med ditt Ring-konto, de närmaste 10 minuterna.</string> - <string name="account_export_end_decryption_title">Dekrypteringsfel</string> <string name="account_export_end_decryption_message">Kunde inte låsa upp ditt konto med det givna lösenordet.</string> <string name="account_export_end_network_title">Nätverksfel</string> <string name="account_export_end_network_message">Kunde inte exportera kontot över nätverket. Kontrollera din uppkoppling.</string> @@ -141,7 +116,6 @@ Du kan ändra kontot senare.</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_creation_error">Fel vid kontoskapande</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_no_network_title">Kan inte ansluta till nätverket</string> @@ -151,12 +125,9 @@ Du kan ändra kontot senare.</string> <string name="account_device_updated_title">Kontoenhet uppdaterad</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_password">Ange ditt lösenord</string> <string name="account_link_prompt_pin">Ange PIN-kod</string> <string name="account_wizard_title">Ring-konto</string> <string name="account_new_button">Skapa ett Ring-konto</string> - <string name="account_link_infos">För att koppla en enhet till det här kontot, måste du först ha en PIN-kod. För att generera PIN-koden, går du till kontohanteringen i en befintlig enhet, väljer det Ring-konto du vill koppla, och väljer \"Koppla en annan enhet till detta konto\".</string> - <string name="account_new_infos">Ange ett lösenord på minst 6 tecken. Detta lösenord används för att lägga till en ny enhet till ditt 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> <string name="account_start_export_button">Generera PIN-kod</string> diff --git a/ring-android/app/src/main/res/values-sv/strings_content_description.xml b/ring-android/app/src/main/res/values-sv/strings_content_description.xml index b8f68dbea08c5e97da9a709bf5543dcf2425d1c9..7040856bbe182f132c6b2c0aea951d363ec853a2 100644 --- a/ring-android/app/src/main/res/values-sv/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-sv/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Snabbsamtal</string> <string name="contact_picture_description">Kontaktbild</string> <string name="dial_numeric_pad">Numerisk knappsats</string> - <string name="dial_alphabetic_pad">Alfabetisk knappsats</string> </resources> diff --git a/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml b/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml index 0f76842c2aa700ed96a3cf05083104df41c8636f..d500d1bb2aa41bf39fca9d0c196543259d8d690e 100644 --- a/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml +++ b/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml @@ -26,10 +26,4 @@ along with this program; if not, write to the Free Software <resources> - <dimen name="bubble_size">100dp</dimen> - <dimen name="bubble_action_size">50dp</dimen> - <dimen name="bubble_action_margin">70dp</dimen> - <dimen name="bubble_action_textdistmin">20dp</dimen> - <dimen name="bubble_action_textdistmax">80dp</dimen> - </resources> \ No newline at end of file diff --git a/ring-android/app/src/main/res/values-sw600dp/dimens.xml b/ring-android/app/src/main/res/values-sw600dp/dimens.xml index 5834a2fd0483d7ac2b2311aa1342ca529887ff51..e323d34ad7a0fab23db8bb5b0632881dd8a9b69a 100644 --- a/ring-android/app/src/main/res/values-sw600dp/dimens.xml +++ b/ring-android/app/src/main/res/values-sw600dp/dimens.xml @@ -20,6 +20,4 @@ along with this program; if not, write to the Free Software --> <resources> - <dimen name="action_bar_title_margin_bottom">20dp</dimen> - </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 a892768c3fef0ea9f86cf6f29d785f38011bac0d..f7bc5c136a91c4ad6f63c1e28af6c9b5febe1907 100644 --- a/ring-android/app/src/main/res/values-tr/strings.xml +++ b/ring-android/app/src/main/res/values-tr/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">E-posta uygulaması bulunamadı, bize rapor gönderebilmek için bir tane yükleyin</string> <string name="email_chooser_title">Şunu kullanarak posta gönder...</string> <!--RingActivity--> - <string name="title_section0">Çevir</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Sil</string> <string name="ab_action_chat">Metin mesajlaşma</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Ayarlar</string> <string name="menu_item_about">Ring Hakkında</string> <!--Dialing Fragment--> - <string name="dial_action_call">Ara</string> <string name="dial_number">Bir numara çevir</string> - <string name="dial_hint">Telefon numarası gir</string> <!--History Fragment--> <string name="hist_replay_button">Yeniden oynat</string> <string name="hist_replay_button_stop">Durdur</string> - <string name="hist_no_history">Geçmiş yok</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Arama %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d Konuşma</item> @@ -62,13 +56,10 @@ <string name="notif_current_call_title">%1$s ile şimdiki arama</string> <string name="notif_current_call">Şimdiki Arama</string> <!--Call Fragment--> - <string name="me">Ben</string> <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="action_settings">Ayarlar</string> - <string name="help_gestures">Bu görünüm arama sırasında çeşitli etkileşimlerle kullanıcılara yardım edecektir. Çeşitli eylemler şunlardır; Uzun basmak, sallamak, kaydırmak vb.</string> <string name="ongoing_call">Giden arama</string> <string name="hist_in_call">%1$s gelen arama</string> <string name="hist_out_call">%1$s giden arama</string> @@ -90,7 +81,6 @@ <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> - <string name="permission_write_denied">Uygulamaya deponuza yazma 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üşme için kamera çalıştırma izni gereklidir.Lütfen etkinleştirmeyi gözden kaçırmayın.</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 e2d9736fbc8bdf1a52c4d97b52e13a4aefd51b46..07da5d4fa2dc5b01ff782134b98781ba9b6aba27 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 @@ -15,16 +15,10 @@ <string name="dialog_warn_ip2ip_account_message">Bir SIP hesabı oluşturabilmeniz için makine adınız geçersiz. Sadece ip çağrıları alabilirsiniz. Hesabınızı daha sonra düzenleyebilirsiniz</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Bir Ring hesabı oluştur</string> <string name="help_ring">Bir Ring hesabı bütünüyle dağıtık ağ üzerinden insanlara uçtan uca güvenle ulaşmanızı sağlar.</string> <string name="help_sip_title">SIP hesabınızı ekleyin</string> <string name="help_sip">Varolan SIP hesabını yapılandır</string> <string name="create_sip_account">Ekle</string> - <string name="share_number">Numara paylaş</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Hesabı silinsin mi ?</string> <string name="account_delete_dialog_message">Bu eylem geri alınamaz.</string> @@ -34,7 +28,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string> <string name="normal_devices_titles">Bu Ring hesabına bilinen aygıtlar bağlı</string> <!--Basic Details--> <string name="account_preferences_basic_tab">Genel</string> - <string name="account_preferences_devices_tab">Aygıtlar</string> <string name="account_basic_category">Temel Ayarlar</string> <string name="account_alias_label">Hesap adı</string> <string name="account_hostname_label">Sunucu adı</string> @@ -75,7 +68,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string> <string name="account_credentials_add">Kimlik bilgisi ekle</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Güvenlik</string> - <string name="account_srtp_deactivated">Devre dışı</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">TLS taşıyıcı kullan</string> @@ -94,23 +86,14 @@ 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_backup_message">Hesap ayarlarını ve kimlik bilgilerini parola ile şifrelenmiş olarak kaydet.</string> - <string name="account_backup_new_password">Yeni parola</string> - <string name="account_backup_confirm_password">Parolayı onayla</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">Yeni aygıt ekle</string> - <string name="account_new_device_message">Yeni aygıtla ilişkilendirmek için Ring hesabının kilidini açın.</string> <string name="restore_backup_wait">Lütfen bekleyin...</string> - <string name="backup_failed_dialog_msg">Bir hata oluştu</string> <string name="error_password_char_count">En az 6 harf</string> <string name="error_passwords_not_equals">Parolalar eşleşmedi</string> <string name="restore_failed_dialog_msg">Bir hata oluştu</string> - <string name="account_export">Dışa aktar</string> <string name="export_account_wait_title">Lütfen bekleyin...</string> <string name="export_account_wait_message">Yeni hesap bilgisi yayınlanıyor</string> - <string name="account_export_end_pin_title">PIN : </string> - <string name="account_export_end_decryption_title">Şifre çözme hatası</string> <string name="account_export_end_decryption_message">Hesabınızın açılamıyor buradan aldığınız parolayı kullanın.</string> <string name="account_export_end_network_title">Ağ hatası</string> <string name="account_export_end_network_message">Hesap ağdan dışarı aktarılamadı. Bağlanabilirliğinizi denetleyin.</string> @@ -125,7 +108,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</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_creation_error">Hesap oluşturma hatası</string> <string name="account_cannot_be_found_title">Hesap bulunamadı</string> <string name="account_no_network_title">Ağa bağlanılamıyor</string> <string name="account_no_network_message">Hesap eklenemiyor çünkü Ring ağ bağlantısından yararlanamıyor. Bağlanabilirliğinizi denetleyin.</string> diff --git a/ring-android/app/src/main/res/values-tr/strings_content_description.xml b/ring-android/app/src/main/res/values-tr/strings_content_description.xml index e0652ba4f526d3d67e679b5c8c0cba317f15af81..4731b364f92d698a970e25303b6d227422336f2a 100644 --- a/ring-android/app/src/main/res/values-tr/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-tr/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Hızlı Ara</string> <string name="contact_picture_description">Kişi Resmi</string> <string name="dial_numeric_pad">Sayısal Tuşlar</string> - <string name="dial_alphabetic_pad">Alfabesel Tuşlar</string> </resources> 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 8797efffa45d525d4d42edba5ff50b549a39bbbe..36955c82191298f45726e965530e9bacf649fc24 100644 --- a/ring-android/app/src/main/res/values-uk/strings.xml +++ b/ring-android/app/src/main/res/values-uk/strings.xml @@ -8,13 +8,11 @@ <string name="no_email_app_installed">Не знайдено жодного поштового додатку, будь ласка встановіть хоча б один поштовий додаток щоб надіслати нам повідомлення</string> <string name="email_chooser_title">Надіслати повідомлення за допомогою...</string> <!--RingActivity--> - <string name="title_section0">Виклик</string> <string name="title_activity_sflphone_home">Ring</string> <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_account_edition_1">Видалити</string> <string name="ab_action_chat">Текстова переписка</string> <!--Left Drawer--> <!--Accessibility--> @@ -26,15 +24,11 @@ <string name="menu_item_settings">Налаштування</string> <string name="menu_item_about">Про Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">Дзвінок</string> <string name="dial_number">Набрати номер</string> - <string name="dial_hint">Введіть номер телефону</string> <!--History Fragment--> <string name="hist_replay_button">Повторити</string> <string name="hist_replay_button_stop">Стоп</string> - <string name="hist_no_history">Немає історії</string> <!--DetailsHistory Fragment--> - <string name="detail_hist_call_number">Виклик %1$s</string> <!--Home Fragment--> <plurals name="home_conferences_title"> <item quantity="one">%d груповий чат</item> @@ -63,13 +57,10 @@ <string name="notif_current_call_title">Діючий виклик з %1$s</string> <string name="notif_current_call">Діючий виклик</string> <!--Call Fragment--> - <string name="me">Я</string> <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="action_settings">Налаштування</string> - <string name="help_gestures">Цей вид допомагає користувачам виконувати різні дії з викликом. Різні дії будуть підписані: довге натискання, свайпи і т.д. </string> <string name="ongoing_call">Поточний дзвінок</string> <string name="hist_in_call">Вхідний виклик тривалістю %1$s</string> <string name="hist_out_call">Вихідний виклик тривалістю %1$s</string> @@ -91,7 +82,6 @@ <string name="message_sending">ВІдправка повідомлення</string> <string name="time_just_now">Прямо зараз</string> <string name="permission_read_denied">Додатоку не було дозволено зчитувати фали з вашого пристрою. Отже, він не може функціонувати належним чином. Будь ласка, розгляньте питання про надання йому такого дозволу</string> - <string name="permission_write_denied">Додатоку не було дозволено записувати на ваш пристрій зберігання. Отже, він не може функціонувати належним чином. Будь ласка, розгляньте питання про надання йому такого дозволу</string> <!--MediaPreferenceFragment--> <string name="permission_dialog_camera_title">Дозволи для камери</string> <string name="permission_dialog_camera_message">Для здійснення відерозмови необхідно надати дозвіл на роботу камери. Будь ласка, розглянути можливість її увімкнення.</string> 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 4b615ffd020863965a91139eb412f5f188fc87eb..b1e7aa7e5ab7390ca8e5f52aeaab8c915e6c8fa5 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 @@ -13,16 +13,10 @@ <string name="dialog_warn_ip2ip_account_message">Ви збираєтесь створити обліковий запис SIP без імені хоста. Вам будуть доступні лише прямі IP дзвінки. Ви зможете відредагувати цей обліковий запис пізніше</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">Створити обліковий запис Ring</string> <string name="help_ring">Акаунт Ring дозволяє досягати людей безпечно у рівноправній та повністю розподіленій мережі.</string> <string name="help_sip_title">Додати Ваш обліковий запис SIP</string> <string name="help_sip">Налаштувати існуючий обліковий запис SIP</string> <string name="create_sip_account">Додати</string> - <string name="share_number">Поділитися номером</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">Видалити акаунт?</string> <string name="account_delete_dialog_message">Ця дія не може бути скасована.</string> @@ -71,7 +65,6 @@ <string name="account_credentials_add">Додати облікові дані</string> <!--SRTP Details--> <string name="account_preferences_security_tab">Безпека</string> - <string name="account_srtp_deactivated">Деактивований</string> <!--SIP--> <!--TLS Details--> <string name="account_tls_transport_switch_label">Використовувати TLS</string> @@ -90,17 +83,12 @@ <string name="account_rtp_min_port">Мінімум</string> <string name="account_rtp_port_range">Порти для передачі аудіо по RTP</string> <!--restore/backup--> - <string name="account_backup_message">Зберегти налаштування облікового запису та облікові дані, пароль в зашифрованому вигляді.</string> - <string name="account_backup_new_password">Новий пароль</string> - <string name="account_backup_confirm_password">Підтвердити пароль</string> <string name="account_restore_message">Введіть пароль для розшифрування файлу.</string> <string name="account_restore_decryption_password">Розшифрування паролю</string> <string name="restore_backup_wait">Будь ласка зачекайте</string> - <string name="backup_failed_dialog_msg">Виникла помилка</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="account_export">Експортувати</string> <string name="account_export_end_error_title">Помилка</string> <string name="account_new_button">Створити обліковий запис Ring</string> <!--Name registration--> diff --git a/ring-android/app/src/main/res/values-uk/strings_content_description.xml b/ring-android/app/src/main/res/values-uk/strings_content_description.xml index 1b226edcc9130436b63f9ced22e515e590da3413..b3b80a5bab83d7f03155b9047f3683f2d3e707ee 100644 --- a/ring-android/app/src/main/res/values-uk/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-uk/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">Швидкий дзвінок</string> <string name="contact_picture_description">Аватар контакту</string> <string name="dial_numeric_pad">Цифровий набір</string> - <string name="dial_alphabetic_pad">Алфавитний набір</string> </resources> 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 d9464aa0f250eb9f0c856aa3a68db8691cada31e..ab6d74c014bc7ec9c7514afafc839e492dc9220f 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 @@ -1,17 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <!--RingActivity--> - <string name="title_section0">拨号</string> <string name="title_activity_sflphone_home">响铃</string> <string name="error_no_network">无网络连接</string> <!--AB menus--> <string name="ab_account_creation">新账户</string> - <string name="ab_account_edition_1">删除</string> <!--Left Drawer--> <!--Accessibility--> <!--Sections--> <!--Dialing Fragment--> - <string name="dial_action_call">打电话</string> <!--History Fragment--> <!--DetailsHistory Fragment--> <!--Home Fragment--> diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml index 709c8919cb134c95cce47321c7828e6b3982804e..9945015b013058400b5508c5ee20956fb3fe66de 100644 --- a/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml +++ b/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml @@ -4,5 +4,4 @@ <string name="contact_quick_call_description">快速拨号</string> <string name="contact_picture_description">联系人头像</string> <string name="dial_numeric_pad">数字拨号盘</string> - <string name="dial_alphabetic_pad">字母拨号盘</string> </resources> 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 0d70d779bb70a007e0aadd7384e32ac342aaea81..7c7018b4377ac047534d6b3f1c187274a1041a53 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 @@ -8,12 +8,10 @@ <string name="no_email_app_installed">沒有找到電子郵件應用程式,請安裝一個來傳送報告給我們</string> <string name="email_chooser_title">傳送郵件藉由...</string> <!--RingActivity--> - <string name="title_section0">撥號</string> <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_account_edition_1">刪除</string> <string name="ab_action_chat">文字訊息</string> <!--Left Drawer--> <!--Accessibility--> @@ -24,10 +22,8 @@ <string name="menu_item_about">關於 Ring</string> <!--Dialing Fragment--> <string name="dial_number">播打一個號碼</string> - <string name="dial_hint">輸入電話號碼</string> <!--History Fragment--> <string name="hist_replay_button_stop">停止</string> - <string name="hist_no_history">沒有記錄</string> <!--DetailsHistory Fragment--> <!--Home Fragment--> <plurals name="home_conferences_title"> @@ -50,11 +46,9 @@ <string name="notif_current_call_title">目前通話和 %1$s</string> <string name="notif_current_call">目前通話</string> <!--Call Fragment--> - <string name="me">我</string> <string name="you_txt_prefix">你:</string> <string name="action_call_conference">會議</string> <string name="action_call_hangup">掛斷</string> - <string name="action_settings">設定</string> <string name="start_error_title">無法啟動 Ring !</string> <string name="action_call_decline">拒絕</string> <string name="ab_action_contact_add">加到聯絡人</string> 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 57050a6f83721a53c79b42577be062a87fd5301c..cbc8dc606f260ec79a5d5bf909412adf51cda11b 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 @@ -9,15 +9,9 @@ <string name="error_field_required">這是必填欄位</string> <string name="dialog_wait_create">正在加入帳號</string> <string name="dialog_warn_ip2ip_account_title">建立空的 SIP 帳號嗎?</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> - <string name="help_ring_title">建立一個 Ring 帳號</string> <string name="help_sip_title">加入你的 SIP 帳號</string> <string name="help_sip">配製一個存在的 SIP 帳號。</string> <string name="create_sip_account">加入</string> - <string name="share_number">分享號碼</string> <!--Strings related to account deletion--> <string name="account_delete_dialog_title">刪除帳號嗎?</string> <string name="account_delete_dialog_message">這個動作無法被復原。</string> @@ -61,16 +55,12 @@ <string name="account_rtp_min_port">最小值</string> <string name="account_rtp_port_range">音訊 RTP 連接埠範圍</string> <!--restore/backup--> - <string name="account_backup_new_password">新密碼</string> - <string name="account_backup_confirm_password">確認密碼</string> <string name="account_restore_message">輸入密碼來解密檔案。</string> <string name="account_restore_decryption_password">解密密碼</string> <string name="restore_backup_wait">請等待...</string> - <string name="backup_failed_dialog_msg">發生錯誤</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="account_export">匯出</string> <string name="account_new_button">建立一個 Ring 帳號</string> <!--Name registration--> </resources> 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 82873ad089d064d0d464b8e0b44f4d68f413f5b0..36706bc1ddbd244a9765eac91660d4b71d092d60 100644 --- a/ring-android/app/src/main/res/values-zh/strings.xml +++ b/ring-android/app/src/main/res/values-zh/strings.xml @@ -3,14 +3,12 @@ <!--RingActivity--> <string name="title_activity_sflphone_home">Ring</string> <!--AB menus--> - <string name="ab_account_edition_1">刪除</string> <!--Left Drawer--> <!--Accessibility--> <!--Sections--> <string name="menu_item_settings">設定</string> <string name="menu_item_about">關於Ring</string> <!--Dialing Fragment--> - <string name="dial_action_call">播打</string> <!--History Fragment--> <!--DetailsHistory Fragment--> <!--Home Fragment--> @@ -20,7 +18,6 @@ <!--Notifications--> <string name="notif_incoming_call">來電</string> <!--Call Fragment--> - <string name="action_settings">設定</string> <string name="ab_action_contact_add">加到聯絡人</string> <!--Text messages--> <!--MediaPreferenceFragment--> diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml index 14e3ea038e6adb434012ff6ae1080bd638e748f6..e6235de620e8b420c219123aaf328fcddc901e65 100644 --- a/ring-android/app/src/main/res/values-zh/strings_account.xml +++ b/ring-android/app/src/main/res/values-zh/strings_account.xml @@ -32,6 +32,5 @@ <!--SIP--> <!--TLS Details--> <!--restore/backup--> - <string name="account_export">輸出</string> <!--Name registration--> </resources> diff --git a/ring-android/app/src/main/res/values/arrays.xml b/ring-android/app/src/main/res/values/arrays.xml index 214ee2dcaaff492b02ff33f223ef8404054e8844..d250a8b68be257ea1b1bdb95f03a2dbabd854bbe 100644 --- a/ring-android/app/src/main/res/values/arrays.xml +++ b/ring-android/app/src/main/res/values/arrays.xml @@ -20,34 +20,11 @@ along with this program; if not, write to the Free Software --> <resources> - <string-array name="menu_items_param"> - <item>@string/menu_item_home</item> - <item>@string/menu_item_accounts</item> - <item>@string/menu_item_about</item> - </string-array> <string-array name="drop_actions"> <item>@string/action_call_attended_transfer</item> <item>@string/action_call_conference</item> </string-array> - <string-array name="srtp_entry_values" translatable="false"> - <item>NONE</item> - <item>SDES</item> - </string-array> - <string-array name="srtp_entry" translatable="false"> - <item>@string/account_srtp_deactivated</item> - <item>SDES</item> - </string-array> - - <string-array name="dtmf_types_values" translatable="false"> - <item>@string/account_sip_dtmf_type_overrtp</item> - <item>@string/account_sip_dtmf_type_sipinfo</item> - </string-array> - <string-array name="dtmf_types_entries" translatable="false"> - <item>RTP</item> - <item>SIP</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 c2e8bcfa153d9fb79aee651d6ad8023f54d40e70..34bfb4d6c206ed55745f389aac2928d6d9d3b3a7 100644 --- a/ring-android/app/src/main/res/values/colors.xml +++ b/ring-android/app/src/main/res/values/colors.xml @@ -2,26 +2,15 @@ <resources> <color name="color_primary_light">#3ac0d2</color> - <color name="color_primary_light_shadow">#40b5c6</color> <color name="color_primary_dark">#004C60</color> <color name="action_blue">#004C60</color> <!-- SFL colors--> - <color name="sfl_pantone631_blue">#56B0C9</color> - <color name="sfl_another_blue">#051d21</color> - <color name="sfl_action_blue">#AA2eadda</color> - <color name="sfl_blue_0">#002930</color> - <color name="sfl_blue_lines">#0a90ce</color> - <color name="sfl_blue_9">#D932B4E4</color> - <color name="sfl_light_blue">#006f82</color> - - <color name="lighter_gray">#ddd</color> + <color name="darker_gray">#aaaaaa</color> <color name="light">#eee</color> - <color name="text_shadow">#054b55</color> - <color name="white">#FFF</color> <color name="black">#000000</color> <color name="error_red">#f44336</color> @@ -33,25 +22,16 @@ <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> diff --git a/ring-android/app/src/main/res/values/dimens.xml b/ring-android/app/src/main/res/values/dimens.xml index b9df22803b78d3accd944a16cbfd5f42f8bc348f..47d2af610ad1f469a2146e578aa4bf8dc4cb4d85 100644 --- a/ring-android/app/src/main/res/values/dimens.xml +++ b/ring-android/app/src/main/res/values/dimens.xml @@ -24,18 +24,9 @@ along with this program; if not, write to the Free Software <dimen name="padding_medium">8dp</dimen> <dimen name="padding_large">16dp</dimen> - <dimen name="bubble_size">60dp</dimen> - <dimen name="bubble_action_size">30dp</dimen> - <dimen name="bubble_action_margin">50dp</dimen> - <dimen name="bubble_action_textdistmin">5dp</dimen> - <dimen name="bubble_action_textdistmax">40dp</dimen> - <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> - <dimen name="contact_drawer_handle_height">36dp</dimen> - <dimen name="contact_drawer_handle_height_with_shadow">40dp</dimen> - <dimen name="contact_vertical_spacing">16dp</dimen> <dimen name="header_history_detail">200dp</dimen> @@ -44,8 +35,6 @@ along with this program; if not, write to the Free Software <dimen name="action_button_bpadding">-45dp</dimen> <dimen name="fab_compat_margin">0dp</dimen> - <dimen name="action_bar_title_margin_bottom">16dp</dimen> - <dimen name="alert_dialog_side_padding_list_view">16dp</dimen> <dimen name="toolbar_content_inset">72dp</dimen> diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml index e4dec2c2169d9c7de67c4541c2eed43d81da4a6a..95046dd4180d5a155502565ed48e0bede6e541fb 100644 --- a/ring-android/app/src/main/res/values/strings.xml +++ b/ring-android/app/src/main/res/values/strings.xml @@ -43,14 +43,12 @@ along with this program; if not, write to the Free Software <u>GNU General Public License version 3 or later</u></string> <!-- RingActivity --> - <string name="title_section0">Dial</string> <string name="title_activity_sflphone_home">Ring</string> <string name="error_no_network">No network connectivity</string> <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_account_edition_1">Delete</string> <string name="ab_action_chat">Text messaging</string> <!-- Left Drawer --> @@ -65,18 +63,14 @@ along with this program; if not, write to the Free Software <string name="menu_item_about">About Ring</string> <!-- Dialing Fragment --> - <string name="dial_action_call">Call</string> <string name="dial_number">Dial a number</string> - <string name="dial_hint">Type phone number</string> <!-- History Fragment --> <string name="hist_replay_button">Replay</string> <string name="hist_replay_button_stop">Stop</string> - <string name="hist_no_history">No history</string> <!-- DetailsHistory Fragment --> - <string name="detail_hist_call_number">Call %1$s</string> <!-- Home Fragment --> <plurals name="home_conferences_title"> @@ -110,13 +104,10 @@ along with this program; if not, write to the Free Software <string name="notif_current_call">Current call</string> <!-- Call Fragment --> - <string name="me">Me</string> <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="action_settings">Settings</string> - <string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string> <string name="ongoing_call">Ongoing call</string> <string name="hist_in_call">Incoming call of %1$s</string> <string name="hist_out_call">Outgoing call of %1$s</string> @@ -139,7 +130,6 @@ along with this program; if not, write to the Free Software <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> - <string name="permission_write_denied">The app was not allowed to write 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> @@ -175,11 +165,8 @@ along with this program; if not, write to the Free Software <string name="prompt_new_password">New password</string> <string name="prompt_new_password_repeat">Repeat new password</string> <string name="account_create_title">Create a Ring account</string> - <string name="help_username_register">Choose a name publicly (experimental).</string> <string name="prompt_new_username">Enter new username</string> <string name="help_password_choose">Choose a strong password you will remember to protect your Ring account.</string> - <string name="btn_use_existing_account">Use an existing Ring account instead</string> - <string name="btn_create_account">Create new account instead</string> <string name="help_password_enter">Enter your main Ring account password</string> <string name="help_pin_enter">Enter the PIN from another configured Ring account. Use the \"export account on Ring\" feature to obtain a PIN.</string> @@ -194,7 +181,6 @@ along with this program; if not, write to the Free Software <string name="unknown">Unknown</string> <!-- Share fragment --> - <string name="share_label">Click on the Ring id to share</string> <string name="share_message">Scan this QRCode with the embedded scanner of the Ring application that wants to communicate with you.</string> <string name="share_message_no_account">Please select an account to share.</string> <string name="share_your_account_information">Share my contact information</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 2fac77aceb78b38da5d1a50108d3bf17422fe17f..2f0585835411efeccc2d1cc36ea5802959f21ea5 100644 --- a/ring-android/app/src/main/res/values/strings_account.xml +++ b/ring-android/app/src/main/res/values/strings_account.xml @@ -43,18 +43,12 @@ along with this program; if not, write to the Free Software You will only be able to make and receive direct ip calls. You can edit your account later</string> - <string-array name="accountType"> - <item>RING</item> - <item>SIP</item> - </string-array> <string name="account_type_ip2ip">IP account</string> - <string name="help_ring_title">Create a Ring account</string> <string name="help_ring">A Ring account allows you to reach people securely in peer to peer through a fully distributed network.</string> <string name="help_sip_title">Add your SIP account</string> <string name="help_sip">Configure an existing SIP account.</string> <string name="create_sip_account">Add</string> - <string name="share_number">Share number</string> <!-- Strings related to account deletion --> <string name="account_delete_dialog_title">Delete account ?</string> @@ -67,7 +61,6 @@ along with this program; if not, write to the Free Software <!-- Basic Details --> <string name="account_preferences_basic_tab">General</string> - <string name="account_preferences_devices_tab">Devices</string> <string name="account_basic_category">Basic Settings</string> <string name="account_alias_label">Account name</string> <string name="account_hostname_label">Hostname</string> @@ -116,11 +109,9 @@ along with this program; if not, write to the Free Software <!-- SRTP Details --> <string name="account_preferences_security_tab">Security</string> - <string name="account_srtp_deactivated">Deactivated</string> <!-- SIP --> <string name="account_sip_dtmf_type_sipinfo" translatable="false">sipinfo</string> - <string name="account_sip_dtmf_type_overrtp" translatable="false">overrtp</string> <!-- TLS Details --> <string name="account_tls_transport_switch_label">Use TLS Transport</string> @@ -140,36 +131,19 @@ 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_backup">Back up</string> <string name="account_restore_account">Restore an account</string> - <string name="account_backup_title">Back up an account</string> - <string name="account_restore_title">Restore accounts</string> - <string name="account_restore_explanation">You can restore previous backup accounts.</string> - <string name="account_backup_message">Save account settings and credentials, password encrypted.</string> - <string name="account_backup_new_password">New password</string> - <string name="account_backup_confirm_password">Confirm password</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">Add new device</string> - <string name="account_new_device_message">Unlock Ring account to associate new device.</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="backup_dialog_title">Back up account</string> - <string name="account_backup_result">"Backup saved in %1$s"</string> - <string name="backup_failed_dialog_title">Backup failed</string> - <string name="backup_failed_dialog_msg">An error occurred</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="account_export">Export</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_pin_title">"PIN : "</string> - <string name="account_export_end_pin_message">Use this PIN along with your main account password to associate your new device to your Ring account during the next 10 minutes.</string> - <string name="account_export_end_decryption_title">Decryption error</string> <string name="account_export_end_decryption_message">Couldn\'t unlock your account using the provided password.</string> <string name="account_export_end_network_title">Network error</string> <string name="account_export_end_network_message">Couldn\'t export account on the network. Check your connectivity.</string> @@ -187,7 +161,6 @@ along with this program; if not, write to the Free Software <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_creation_error">Error creating account</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_no_network_title">Can\'t connect to the network</string> @@ -198,12 +171,9 @@ along with this program; if not, write to the Free Software <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_password">Enter your password</string> <string name="account_link_prompt_pin">Enter PIN</string> <string name="account_wizard_title">Ring account</string> <string name="account_new_button">Create a Ring account</string> - <string name="account_link_infos">To link another device to this account, you first need to obtain a pin code. To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and select "Link another device to this account". </string> - <string name="account_new_infos">Please choose a password of at least 6 characters. This password will be asked to add new devices to your 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> <string name="account_start_export_button">Generate Pin</string> diff --git a/ring-android/app/src/main/res/values/strings_content_description.xml b/ring-android/app/src/main/res/values/strings_content_description.xml index f1397d5544f8951c1ae4dc92f30a04425e93dc60..e70dc9b424f888b7a1787d1b2dce8e8cf5c9fc85 100644 --- a/ring-android/app/src/main/res/values/strings_content_description.xml +++ b/ring-android/app/src/main/res/values/strings_content_description.xml @@ -4,6 +4,5 @@ <string name="contact_quick_call_description">Quick Call</string> <string name="contact_picture_description">Contact Picture</string> <string name="dial_numeric_pad">Numeric dialpad</string> - <string name="dial_alphabetic_pad">Alphabetic dialpad</string> </resources> \ No newline at end of file diff --git a/ring-android/app/src/main/res/values/strings_preferences.xml b/ring-android/app/src/main/res/values/strings_preferences.xml index 1e9ec4de16cd64083e43b37263bf1228b60bfb7d..1b79c5f6792b015d7b8ade5d5a131c2f20c9415b 100644 --- a/ring-android/app/src/main/res/values/strings_preferences.xml +++ b/ring-android/app/src/main/res/values/strings_preferences.xml @@ -5,7 +5,6 @@ <string name="pref_category_system">System</string> <string name="pref_category_privacy">Privacy</string> - <string name="pref_mobileData_key" translatable="false">pref_mobileData</string> <string name="pref_mobileData_title">Mobile data</string> <string name="pref_mobileData_summary">Allow Ring on 3G/LTE networks additionally to Wi-Fi</string> @@ -19,11 +18,9 @@ <string name="pref_systemDialer_title">Place system calls using Ring</string> <string name="pref_systemDialer_summary">Use Ring to place system calls when possible.</string> - <string name="pref_startOnBoot_key" translatable="false">pref_startOnBoot</string> <string name="pref_startOnBoot_title">Start Ring on startup</string> <string name="pref_startOnBoot_summary">Run Ring in the background when the system starts.</string> - <string name="pref_clearHistory_key" translatable="false">pref_clearHistory</string> <string name="pref_clearHistory_title">Clear history</string> <string name="pref_clearHistory_summary">Clear all the conversations history. This action can not be undone.</string> diff --git a/ring-android/app/src/main/res/xml/account_credentials.xml b/ring-android/app/src/main/res/xml/account_credentials.xml deleted file mode 100644 index a22756f97baf483998eb6f24118f6e07c9a21a63..0000000000000000000000000000000000000000 --- a/ring-android/app/src/main/res/xml/account_credentials.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- -Copyright (c) 2016 Savoir-faire Linux Inc. - -Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com> -Author: 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, see <http://www.gnu.org/licenses/>. ---> -<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <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.PreferenceScreen> \ No newline at end of file