mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into favourites

Browse source 
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
This commit is contained in:
Mario Danic 2017-03-24 09:44:50 +01:00
commit 0d24f87717
33 changed files with 59 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -188,8 +188,6 @@ dependencies {
compile 'org.parceler:parceler-api:1.1.6'
annotationProcessor 'org.parceler:parceler:1.1.6'
modifiedCompile 'com.google.firebase:firebase-core:10.2.0'
/// dependencies for local unit tests
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'

20
src/main/java/com/owncloud/android/MainApp.java
View file

@ -34,7 +34,6 @@ import android.support.multidex.MultiDexApplication;
import android.support.v4.util.Pair;
import com.evernote.android.job.JobManager;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.owncloud.android.authentication.PassCodeManager;
import com.owncloud.android.datamodel.SyncedFolder;
import com.owncloud.android.datamodel.SyncedFolderProvider;
@ -81,8 +80,6 @@ public class MainApp extends MultiDexApplication {
private static SyncedFolderObserverService mObserverService;
private static FirebaseAnalytics firebaseAnalytics;
@SuppressWarnings("unused")
private boolean mBound;
@ -92,12 +89,6 @@ public class MainApp extends MultiDexApplication {
JobManager.create(this).addJobCreator(new NCJobCreator());
MainApp.mContext = getApplicationContext();
firebaseAnalytics = FirebaseAnalytics.getInstance(this);
if (!getResources().getBoolean(R.bool.analytics_enabled)) {
firebaseAnalytics.setAnalyticsCollectionEnabled(false);
}
SharedPreferences appPrefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
MainApp.storagePath = appPrefs.getString(Preferences.PreferenceKeys.STORAGE_PATH, Environment.
@ -329,15 +320,4 @@ public class MainApp extends MultiDexApplication {
}
};
public static FirebaseAnalytics getFirebaseAnalyticsInstance() {
/*
In order for Firebase Analytics to work, you also need to
put a proper google-services.json in src/custom folder
If that file is flawed, nothing will be sent to Firebase
*/
return firebaseAnalytics;
}
}

2
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -716,8 +716,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
// bound here to avoid spurious changes triggered by Android on device rotations
mHostUrlInput.setOnFocusChangeListener(this);
mHostUrlInput.addTextChangedListener(mHostUrlInputWatcher);

7
src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
View file

@ -39,7 +39,6 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@ -134,12 +133,6 @@ public class ErrorsWhileCopyingHandlerActivity extends AppCompatActivity
okBtn.setOnClickListener(this);
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* Customized adapter, showing the local files as main text in two-lines list item and the
* remote files as the secondary text.

5
src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java
View file

@ -40,7 +40,6 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.operations.RemoteOperation;
@ -104,7 +103,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
caption = getIntent().getStringExtra(EXTRA_ACTION);
} else {
caption = getString(R.string.default_display_name_for_root_folder);
};
}
getSupportActionBar().setTitle(caption);
setIndeterminate(mSyncInProgress);
@ -237,8 +236,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
super.onResume();
Log_OC.e(TAG, "onResume() start");
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
// refresh list of files
refreshListOfFilesFragment(false);

6
src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
View file

@ -97,12 +97,6 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
setupContent();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* sets up the UI elements and loads all media/synced folders.
*/

7
src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java
View file

@ -32,7 +32,6 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import java.util.ArrayList;
@ -85,12 +84,6 @@ public class GenericExplanationActivity extends AppCompatActivity {
}
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
public class ExplanationListAdapterView extends ArrayAdapter<String> {
ArrayList<String> mList;

7
src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java
View file

@ -36,7 +36,6 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.dialog.LoadingDialog;
@ -119,12 +118,6 @@ public class LogHistoryActivity extends ToolbarActivity {
}
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
boolean retval = true;

6
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java
View file

@ -118,12 +118,6 @@ public class ManageAccountsActivity extends FileActivity
initializeComponentGetters();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public void onBackPressed() {
Intent resultIntent = new Intent();

7
src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java
View file

@ -32,7 +32,6 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -69,12 +68,6 @@ public class ManageSpaceActivity extends AppCompatActivity {
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
boolean retval = true;

6
src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java
View file

@ -30,7 +30,6 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
/**
@ -57,11 +56,6 @@ public class ParticipateActivity extends FileActivity {
setupContent();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
private void setupContent() {
TextView betaView = (TextView) findViewById(R.id.participate_beta_text);

7
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
View file

@ -38,7 +38,6 @@ import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -141,12 +140,6 @@ public class PassCodeActivity extends AppCompatActivity {
setTextListeners();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* Enables or disables the cancel button to allow the user interrupt the ACTION
* requested to the activity.

1
src/main/java/com/owncloud/android/ui/activity/Preferences.java
View file

@ -561,7 +561,6 @@ public class Preferences extends PreferenceActivity
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
SharedPreferences appPrefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

7
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -41,7 +41,6 @@ import android.widget.Button;
import android.widget.Spinner;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.db.PreferenceManager;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -298,12 +297,6 @@ public class UploadFilesActivity extends FileActivity implements
Log_OC.d(TAG, "onSaveInstanceState() end");
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* Pushes a directory to the drop down list
* @param directory to push

5
src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
View file

@ -39,7 +39,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.OCFile;
@ -119,8 +118,6 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
Log_OC.v(TAG, "onResume() start");
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
// Listen for upload messages
mUploadMessagesReceiver = new UploadMessagesReceiver();
IntentFilter uploadIntentFilter = new IntentFilter();
@ -324,7 +321,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
mUploaderBinder = null;
}
}
};
}
/**
* Once the file upload has changed its status -> update uploads list view

7
src/main/java/com/owncloud/android/ui/activity/UploadPathActivity.java
View file

@ -23,7 +23,6 @@ import android.accounts.Account;
import android.os.Bundle;
import android.view.View.OnClickListener;
import com.owncloud.android.MainApp;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.fragment.OCFileListFragment;
@ -49,12 +48,6 @@ public class UploadPathActivity extends FolderPickerActivity implements FileFrag
setFile(folder);
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* Called when the ownCloud {@link Account} associated to the Activity was
* just updated.

6
src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
View file

@ -118,12 +118,6 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
updateNextButtonIfNeeded();
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
@Override
public void onBackPressed() {
onFinish();

9
src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
View file

@ -32,7 +32,6 @@ import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@ -377,14 +376,6 @@ public class EditShareFragment extends Fragment {
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
/**
* Get {@link OCShare} instance from DB and updates the UI.
*

7
src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -107,13 +107,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
mProgressListener = null;
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {

22
src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
View file

@ -32,7 +32,6 @@ import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.adapter.LocalFileListAdapter;
@ -65,13 +64,6 @@ public class LocalFileListFragment extends ExtendedListFragment {
setHasOptionsMenu(true);
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
/**
* {@inheritDoc}
@ -141,7 +133,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
} else { /// Click on a file
ImageView checkBoxV = (ImageView) v.findViewById(R.id.custom_checkbox);
if (checkBoxV != null) {
if (((AbsListView)getListView()).isItemChecked(position)) {
if (getListView().isItemChecked(position)) {
checkBoxV.setImageResource(R.drawable.ic_checkbox_marked);
} else {
checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
@ -222,7 +214,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
}
// by now, only files in the same directory will be kept as selected
((AbsListView)mCurrentListView).clearChoices();
mCurrentListView.clearChoices();
mAdapter.swapDirectory(directory);
if (mDirectory == null || !mDirectory.equals(directory)) {
mCurrentListView.setSelection(0);
@ -238,7 +230,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*/
public String[] getCheckedFilePaths() {
ArrayList<String> result = new ArrayList<String>();
SparseBooleanArray positions = ((AbsListView)mCurrentListView).getCheckedItemPositions();
SparseBooleanArray positions = mCurrentListView.getCheckedItemPositions();
if (positions.size() > 0) {
for (int i = 0; i < positions.size(); i++) {
if (positions.get(positions.keyAt(i)) == true) {
@ -270,7 +262,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
* @param select <code>true</code> to select all, <code>false</code> to deselect all
*/
public void selectAllFiles(boolean select) {
AbsListView listView = (AbsListView) getListView();
AbsListView listView = getListView();
for (int position = 0; position < listView.getCount(); position++) {
File file = (File) mAdapter.getItem(position);
if (file.isFile()) {
@ -289,7 +281,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*
* @param directory
*/
public void onDirectoryClick(File directory);
void onDirectoryClick(File directory);
/**
* Callback method invoked when a file (non directory)
@ -297,7 +289,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*
* @param file
*/
public void onFileClick(File file);
void onFileClick(File file);
/**
@ -306,7 +298,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
*
* @return Directory to list firstly. Can be NULL.
*/
public File getInitialDirectory();
File getInitialDirectory();
}

9
src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java
View file

@ -35,7 +35,6 @@ import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.ListView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -105,14 +104,6 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
/**
* {@inheritDoc}
*/

9
src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
View file

@ -44,7 +44,6 @@ import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.OCFile;
@ -178,14 +177,6 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
}
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {

11
src/main/java/com/owncloud/android/ui/fragment/UploadListFragment.java
View file

@ -27,7 +27,6 @@ import android.view.ViewGroup;
import android.widget.ExpandableListView;
import android.widget.ListView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.db.OCUpload;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -73,14 +72,6 @@ public class UploadListFragment extends ExpandableListFragment {
return v;
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
@Override
public void onRefresh() {
// remove the progress circle as soon as pull is triggered, like in the list of files
@ -144,7 +135,7 @@ public class UploadListFragment extends ExpandableListFragment {
* @param file the file that has been clicked on.
* @return return true if click was handled.
*/
public boolean onUploadItemClick(OCUpload file);
boolean onUploadItemClick(OCUpload file);
}
public void binderReady(){

9
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -39,7 +39,6 @@ import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.FileMenuFilter;
@ -333,14 +332,6 @@ public class PreviewImageFragment extends FileFragment {
mContainerActivity.showDetails(getFile());
}
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
}
@Override
public void onPause() {
super.onPause();

6
src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

@ -50,7 +50,6 @@ import android.widget.ImageView;
import android.widget.Toast;
import android.widget.VideoView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.FileMenuFilter;
@ -190,7 +189,7 @@ public class PreviewMediaFragment extends FileFragment implements
}
else {
file = (OCFile) savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE);
file = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE);
setFile(file);
mAccount = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_ACCOUNT);
mSavedPlaybackPosition =
@ -516,9 +515,6 @@ public class PreviewMediaFragment extends FileFragment implements
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
Log_OC.v(TAG, "onResume");
}

4
src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
View file

@ -33,7 +33,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.FileMenuFilter;
@ -397,9 +396,6 @@ public class PreviewTextFragment extends FileFragment {
@Override
public void onResume() {
super.onResume();
if (getActivity() != null) {
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(getActivity(), SCREEN_NAME, TAG);
}
Log_OC.e(TAG, "onResume");
}

6
src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java
View file

@ -33,7 +33,6 @@ import android.support.v7.app.AlertDialog;
import android.widget.MediaController;
import android.widget.VideoView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.accounts.AccountUtils;
@ -106,11 +105,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
mVideoPlayer.setKeepScreenOn(true);
}
@Override
protected void onResume() {
super.onResume();
MainApp.getFirebaseAnalyticsInstance().setCurrentScreen(this, SCREEN_NAME, TAG);
}
/**
* {@inheritDoc}

34
src/main/res/values-es-rMX/strings.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="about_android">%1$s Android app</string>
<string name="about_android">%1$s aplicación Android</string>
<string name="about_version">versión %1$s</string>
<string name="actionbar_sync">Actualizar cuenta</string>
<string name="actionbar_upload">Subir archivo</string>
<string name="actionbar_upload">Cargar</string>
<string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
<string name="actionbar_upload_files">Archivos</string>
<string name="actionbar_open_with">Abrir con</string>
@ -11,15 +11,15 @@
<string name="actionbar_settings">Ajustes</string>
<string name="actionbar_see_details">Detalles</string>
<string name="actionbar_send_file">Enviar</string>
<string name="actionbar_sort">Filtrar</string>
<string name="actionbar_sort_title">Filtrar por</string>
<string name="actionbar_sort">Ordenar</string>
<string name="actionbar_sort_title">Ordenar por</string>
<string name="menu_item_sort_by_name">A - Z</string>
<string name="menu_item_sort_by_date">Más reciente - Más antiguo</string>
<string name="menu_item_sort_by_size">Más grande - Más pequeño</string>
<string name="menu_item_sort_by_size">Mayor - Menor</string>
<string name="drawer_item_all_files">Todos los archivos</string>
<string name="drawer_item_on_device">En su dispositivo</string>
<string name="drawer_item_on_device">En el dispositivo</string>
<string name="drawer_item_settings">Ajustes</string>
<string name="drawer_item_uploads_list">Subidas</string>
<string name="drawer_item_uploads_list">Cargas</string>
<string name="drawer_quota">%1$s de %2$s usados</string>
<string name="drawer_close">Cerrar</string>
<string name="drawer_open">Abrir</string>
@ -29,23 +29,23 @@
<string name="prefs_manage_accounts">Administrar cuentas</string>
<string name="prefs_passcode">Código de seguridad</string>
<string name="prefs_show_hidden_files">Mostrar archivos escondidos</string>
<string name="prefs_instant_upload">Subida instantánea de imágenes</string>
<string name="prefs_instant_upload_summary">Subida instantánea de fotografías tomadas por la cámara</string>
<string name="prefs_instant_video_upload">Subida instantánea de video</string>
<string name="prefs_instant_video_upload_summary">Subida instantánea de videos grabados por la cámara</string>
<string name="prefs_instant_upload">Carga instantánea de imágenes</string>
<string name="prefs_instant_upload_summary">Cargar instantáneamente las fotografías tomadas por la cámara</string>
<string name="prefs_instant_video_upload">Carga instantánea de video</string>
<string name="prefs_instant_video_upload_summary">Cargar instantáneamente los videos grabados por la cámara</string>
<string name="prefs_log_title">Activar registro</string>
<string name="prefs_log_summary">Esto es usado para registrar problemas</string>
<string name="prefs_log_title_history">Historial de registro</string>
<string name="prefs_log_summary_history">Esto muestra los registros grabados</string>
<string name="prefs_log_delete_history_button">Borrar historial</string>
<string name="prefs_calendar_contacts">Sincronizar calendario &amp; contactos</string>
<string name="prefs_calendar_contacts_summary">Configure DAVdroid (v1.3.0+) para la cuenta actual</string>
<string name="prefs_calendar_contacts_summary">Configurar DAVdroid (v1.3.0+) para la cuenta actual</string>
<string name="prefs_calendar_contacts_address_resolve_error">La dirección del servidor para la cuenta no se pudo resolver para DAVdroid</string>
<string name="prefs_calendar_contacts_no_store_error">No se encuentran instaladas las aplicaciones Google Play o F-Droid</string>
<string name="prefs_calendar_contacts_sync_setup_successful">La configuración de Calendario &amp; contactos se sincronizaron exitosamente</string>
<string name="prefs_help">Ayuda</string>
<string name="prefs_recommend">Recomendar a un amigo</string>
<string name="prefs_feedback">Mensajes de retroalimentación</string>
<string name="prefs_feedback">Retroalimentación</string>
<string name="prefs_imprint">Imprint</string>
<string name="prefs_remember_last_share_location">Recordar la ubicación compartida</string>
<string name="prefs_remember_last_upload_location_summary">Recordar la última ubicación de subida</string>
@ -59,16 +59,16 @@
<string name="auth_password">Contraseña</string>
<string name="sync_string_files">Archivos</string>
<string name="setup_btn_connect">Conectar</string>
<string name="uploader_btn_upload_text">Subir</string>
<string name="uploader_btn_upload_text">Cargar</string>
<string name="uploader_top_message">Elegir carpeta de subida</string>
<string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
<string name="uploader_wrn_no_account_text">No hay %1$s cuentas en su dispositivo. Por favor configure una cuenta primero.</string>
<string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
<string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
<string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
<string name="uploader_error_title_no_file_to_upload">No hay archivo para subir</string>
<string name="uploader_error_title_no_file_to_upload">No hay un archivo para cargar</string>
<string name="uploader_error_message_received_piece_of_text">%1$s no puede subir una pieza de texto como un archivo.</string>
<string name="uploader_error_message_no_file_to_upload">La información recibida no incluye un archivo válido.</string>
<string name="uploader_error_title_file_cannot_be_uploaded">El archivo no puede ser subido</string>
<string name="uploader_error_title_file_cannot_be_uploaded">El archivo no se puede cargar</string>
<string name="uploader_error_message_read_permission_not_granted">%1$s no tiene permitido leer el archivo recibido</string>
<string name="uploader_error_message_source_file_not_found">El archivo a subir no fue encontrado en esta localización. Por favor revise si existe el archivo.</string>
<string name="uploader_error_message_source_file_not_copied">Un error ocurrió mientras se copiaba el archivo a una carpeta temporal. Por favor intente enviarlo de nuevo.</string>

2
src/main/res/values-fi-rFI/strings.xml
View file

@ -378,7 +378,7 @@
<string name="share_with_user_section_title">Jaa käyttäjien ja ryhmien kanssa</string>
<string name="share_add_user_or_group">Lisää käyttäjä tai ryhmä</string>
<string name="share_via_link_section_title">Jaa linkki</string>
<string name="share_via_link_expiration_date_label">Aseta päättymispäivä</string>
<string name="share_via_link_expiration_date_label">Aseta vanhenemispäivä</string>
<string name="share_via_link_password_label">Suojaa salasanalla</string>
<string name="share_via_link_password_title">Turvattu</string>
<string name="share_via_link_edit_permission_label">Salli muokkaus</string>

4
src/main/res/values-fr/strings.xml
View file

@ -348,7 +348,7 @@
<string name="network_error_socket_exception">Une erreur est survenue pendant la connexion au serveur.</string>
<string name="network_error_socket_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
<string name="network_error_connect_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
<string name="network_host_not_available">L\'opération n\'a pas pu être terminée, le serveur n\'est pas disponible</string>
<string name="network_host_not_available">Impossible de réaliser l\'opération, le serveur n\'est pas accessible.</string>
<string name="forbidden_permissions">Vous n\'avez pas la permission %s</string>
<string name="forbidden_permissions_rename">de renommer ce fichier</string>
<string name="forbidden_permissions_delete">de supprimer ce fichier</string>
@ -550,7 +550,7 @@
<string name="welcome_feature_1_text">Accédez, partagez et protégez vos fichiers personnels et professionnels</string>
<string name="welcome_feature_2_title">Multi-compte</string>
<string name="welcome_feature_2_text">Connecter tous vos clouds</string>
<string name="welcome_feature_2_text">Connectez-vous avec plusieurs comptes clouds</string>
<string name="welcome_feature_3_title">Téléversement immédiat</string>
<string name="welcome_feature_3_text">Conservez vos photos en toute sécurité</string>

26
src/main/res/values-sk-rSK/strings.xml
View file

@ -66,9 +66,11 @@
<string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
<string name="uploader_wrn_no_account_quit_btn_text">Koniec</string>
<string name="uploader_error_title_no_file_to_upload">Žiadny súbor pre nahratie</string>
<string name="uploader_error_message_received_piece_of_text">%1$s nie je možné nahrať text ako súbor.</string>
<string name="uploader_error_message_no_file_to_upload">Prijaté dáta neobsahujú žiadny platný súbor.</string>
<string name="uploader_error_title_file_cannot_be_uploaded">Súbor nie je možné nahrať</string>
<string name="uploader_error_message_read_permission_not_granted">%1$s nie je oprávnený čítať prijatý súbor</string>
<string name="uploader_error_message_source_file_not_found">Súbor, ktorý sa pokúšate nahrať nebol nájdený. Overte prosím či súbor existuje.</string>
<string name="uploader_error_message_source_file_not_copied">Pri kopírovaní súboru do dočasného priečinka došlo k chybe. Skúste prosím znova.</string>
<string name="uploader_upload_files_behaviour">Možnosti nahratia</string>
<string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Presuň súbor do Nextcloud priečinka</string>
@ -80,6 +82,8 @@
<string name="file_list_loading">Načítavam...</string>
<string name="file_list_no_app_for_file_type">Aplikácia pre váš typ súboru sa nenašla!</string>
<string name="local_file_list_empty">V tomto priečinku nie sú žiadne súbory.</string>
<string name="file_list_empty_headline_search">Žiadne výsledky v tomto priečinku</string>
<string name="file_list_empty_search">Skúsiť prezrieť iný priečinok?</string>
<string name="upload_list_empty_headline">Žiadne súbory na nahratie nie sú dostupné</string>
<string name="upload_list_empty_text">Nahrajte nejaký obsah alebo aktivujte okamžité nahrávanie!</string>
<string name="file_list_folder">priečinok</string>
@ -170,6 +174,7 @@
<string name="foreign_files_fail">Niektoré súbory nebolo možné premiestniť</string>
<string name="foreign_files_local_text">Lokálne: %1$s</string>
<string name="foreign_files_remote_text">Vzdialené: %1$s</string>
<string name="upload_query_move_foreign_files">Nedostatok voľného miesta na skopírovanie vybraných súborov do priečinka %1$s. Prajete si ich radšej presunúť?</string>
<string name="pass_code_enter_pass_code">Vložte prosím svoje heslo</string>
<string name="pass_code_configure_your_pass_code">Vložte svoje heslo</string>
@ -201,6 +206,8 @@
<string name="media_play_pause_description">Tlačidlo prehrávania / pauzy</string>
<string name="media_forward_description">Tlačidlo \"rýchlo vpred\"</string>
<string name="auth_getting_authorization">Získavam autorizáciu &#8230;</string>
<string name="auth_trying_to_login">Prihlasujem sa &#8230;</string>
<string name="auth_no_net_conn_title">Bez sieťového pripojenia</string>
<string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
<string name="auth_connection_established">Pripojenie vytvorené</string>
@ -232,6 +239,8 @@
<string name="auth_can_not_auth_against_server">Nie je možné sa overiť voči tomuto serveru</string>
<string name="auth_account_does_not_exist">Účet zatiaľ v zariadení neexistuje</string>
<string name="favorite">Dostupné v režime offline</string>
<string name="unfavorite">Nedostupné v režime offline</string>
<string name="common_rename">Premenovať</string>
<string name="common_remove">Odstrániť</string>
<string name="confirmation_remove_file_alert">Naozaj chcete odstrániť %1$s?</string>
@ -352,10 +361,13 @@
<string name="file_migration_dialog_title">Aktualizujem cestu k úložisku</string>
<string name="file_migration_finish_button">Dokončiť</string>
<string name="file_migration_preparing">Pripravujem na presun&#8230;</string>
<string name="file_migration_checking_destination">Kontrolujem umiestnenie&#8230;</string>
<string name="file_migration_saving_accounts_configuration">Ukladám konfiguráciu účtov&#8230;</string>
<string name="file_migration_waiting_for_unfinished_sync">Čakám na nedokončenú synchronizáciu&#8230;</string>
<string name="file_migration_migrating">Presúvam dáta&#8230;</string>
<string name="file_migration_updating_index">Aktualizujem zoznam&#8230;</string>
<string name="file_migration_cleaning">Čistenie&#8230;</string>
<string name="file_migration_restoring_accounts_configuration">Obnovujem konfiguráciu účtu&#8230;</string>
<string name="file_migration_ok_finished">Hotovo</string>
<string name="file_migration_failed_not_enough_space">CHYBA: Nedostatok miesta</string>
<string name="file_migration_failed_not_writable">CHYBA: Súbor nie je zapisovateľný</string>
@ -375,6 +387,7 @@
<string name="actionbar_logger">Logy</string>
<string name="log_send_history_button">Odoslať históriu</string>
<string name="log_send_no_mail_app">Aplikácia na odoslanie logov nenájdená. Prosím nainštalujte emailovú aplikáciu.</string>
<string name="log_send_mail_subject">%1$s Android app logs</string>
<string name="log_progress_dialog_text">Načítavam dáta &#8230;</string>
@ -455,6 +468,8 @@
<string name="search_users_and_groups_hint">Vyhľadať používateľov alebo skupiny</string>
<string name="share_group_clarification">%1$s (skupina)</string>
<string name="share_remote_clarification">%1$s (vzdialený)</string>
<string name="share_email_clarification">%1$s (email)</string>
<string name="share_sharee_unavailable">Je nám ľúto, verzia vášho servera neumožňuje sprístupňovanie obsahu používateľom alebo skupinám. \nProsím, obráťte sa na svojho správcu</string>
<string name="share_privilege_can_share">môže sprístupniť</string>
<string name="share_privilege_can_edit">môže upraviť</string>
@ -476,6 +491,7 @@
<string name="manage_space_clear_data">Vyčistiť dáta</string>
<string name="manage_space_error">Niektoré súbory nebolo možné zmazať.</string>
<string name="permission_storage_access">Na nahrávanie a sťahovanie súborov sú potrebné dodatočné oprávnenia.</string>
<string name="local_file_not_found_toast">Súbor nebolo možné nájsť na lokálnom úložisku</string>
<string name="confirmation_remove_files_alert">Naozaj chcete odstrániť vybraté položky?</string>
<string name="confirmation_remove_folders_alert">Naozaj chcete odstrániť vybraté položky a ich obsah?</string>
@ -485,10 +501,16 @@
<string name="drawer_folder_sync">Automatické nahratie</string>
<string name="drawer_participate">Zúčastniť sa</string>
<string name="participate_testing_headline">Pomôžte nám s testovaním.</string>
<string name="participate_testing_bug_text">Našli ste chybu? Niečo nefunguje?</string>
<string name="participate_testing_report_text">Nahlásiť chybu na Githube</string>
<string name="participate_testing_version_text">Máte záujem pomôcť nám s testovaním ďalšej Verzie?</string>
<string name="participate_beta_headline">Testovať Beta verziu</string>
<string name="participate_beta_text">Táto verzia obsahuje všetký pripravované funkcie. Je veľmi nestabilná a môže obsahovať chyby. Ak na ne natrafíte, prosím nahláste nám ich. &lt;br/>&lt;a href=\"%2$s\">Stiahnúť APK&lt;/a> alebo</string>
<string name="participate_contribute_headline">Aktívne prispievať</string>
<string name="participate_contribute_irc_text">Vst=upte do chatu na IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
<string name="participate_contribute_forum_text">Pomôž ostatným na &lt;a href=\"%1$s\">fóre&lt;/a></string>
<string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Preložiť&lt;/a> aplikáciu</string>
<string name="participate_contribute_github_text">Prispejte ako vývojár, pre viac informácií pozrite &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a></string>
<string name="move_to">Presunúť do&#8230;</string>
<string name="copy_to">Kopírovať do&#8230;</string>
<string name="choose_remote_folder">Vybrať priečinok&#8230;</string>
@ -518,7 +540,11 @@
<!-- Welcome to Nc intro features -->
<string name="welcome_feature_1_title">Bezpečný domov pre všetky vaše dáta</string>
<string name="welcome_feature_1_text">Zdieľajte, chránte a pristupujte k svojím súborom doma aj na pracovisku</string>
<string name="welcome_feature_2_title">Viac účtov</string>
<string name="welcome_feature_2_text">Pripojte sa k všetkým vaším cloudovým službám</string>
<string name="welcome_feature_3_title">Okamžité nahratie</string>
<string name="welcome_feature_3_text">Udržujte svoje fotografie v bezpečí</string>

2
src/main/res/values/setup.xml
View file

@ -16,7 +16,7 @@
<string name ="data_folder">nextcloud</string>
<string name ="log_name">nextcloud</string>
<string name ="default_display_name_for_root_folder">Nextcloud</string>
<string name ="user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s</string>
<string name ="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
<!-- URLs and flags related -->
<string name="server_url"></string>

2
src/modified/res/values/setup.xml
View file

@ -16,7 +16,7 @@
<string name ="data_folder">nextcloud</string>
<string name ="log_name">nextcloud</string>
<string name ="default_display_name_for_root_folder">Nextcloud</string>
<string name ="user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s</string>
<string name ="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
<!-- URLs and flags related -->
<string name="server_url"></string>