diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java index 2a0f25eb..96f7e00d 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.support.design.widget.AppBarLayout; @@ -69,11 +68,8 @@ import butterknife.OnClick; public class AboutActivity extends ThemedActivity implements IntellihideToolbarActivityListener { - private SectionsPagerAdapter mSectionsPagerAdapter; - private ViewPager mViewPager; - @BindView(R.id.about__appbar) - AppBarLayout appBarLayout; + protected AppBarLayout appBarLayout; @BindView(R.id.main__topbar) protected Toolbar toolbar; @@ -100,10 +96,10 @@ public class AboutActivity extends ThemedActivity }); // Create the adapter that will return a fragment for each of the three // primary sections of the activity. - mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); + SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); // Set up the ViewPager with the sections adapter. - mViewPager = ButterKnife.findById(this, R.id.container); + ViewPager mViewPager = ButterKnife.findById(this, R.id.container); mViewPager.setAdapter(mSectionsPagerAdapter); tabLayout.setupWithViewPager(mViewPager); @@ -289,9 +285,8 @@ public class AboutActivity extends ThemedActivity } public String getContributorsHtml(Context context) { - String text = Helpers.readTextfileFromRawRessource(context, R.raw.contributors, + return Helpers.readTextfileFromRawRessource(context, R.raw.contributors, "* ", "
"); - return text; } public String getMaintainersHtml(Context context) { @@ -390,7 +385,6 @@ public class AboutActivity extends ThemedActivity try { PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0); AppSettings appSettings = ((App) getActivity().getApplication()).getSettings(); - DiasporaUrlHelper urls = new DiasporaUrlHelper(appSettings); packageName.setText(pInfo.packageName); appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName + " (" + pInfo.versionCode + ")")); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java index 2eee623f..b9b87921 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java @@ -113,10 +113,10 @@ public class AspectListFragment extends ThemedFragment implements OnSomethingCli } public static class AspectAdapter extends RecyclerView.Adapter { - private AppSettings appSettings; - private DiasporaAspect[] aspectList; - private List aspectFavsList; - private OnSomethingClickListener aspectClickedListener; + private final AppSettings appSettings; + private final DiasporaAspect[] aspectList; + private final List aspectFavsList; + private final OnSomethingClickListener aspectClickedListener; static class ViewHolder extends RecyclerView.ViewHolder { @BindView(R.id.recycler_view__list_item__text) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index b5fb2ac5..7e894bb4 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -34,7 +34,6 @@ import android.support.customtabs.CustomTabsSession; import android.support.design.widget.AppBarLayout; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.content.LocalBroadcastManager; import android.support.v4.view.GravityCompat; @@ -762,7 +761,7 @@ public class MainActivity extends ThemedActivity if (WebHelper.isOnline(MainActivity.this)) { final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false); + @SuppressLint("InflateParams") View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false); final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input); ThemeHelper.updateEditTextColor(input); final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { @@ -896,7 +895,7 @@ public class MainActivity extends ThemedActivity AppLog.v(this, "Set shared text; Subject: \"" + escapedSubject + "\" Body: \"" + escapedBody + "\""); textToBeShared = "**" + escapedSubject + "** " + escapedBody; } else { - AppLog.v(this, "Set shared text; Subject: \"" + sharedSubject + "\" Body: \"" + sharedBody + "\""); + AppLog.v(this, "Set shared text; Subject: \"null\" Body: \"" + sharedBody + "\""); textToBeShared = escapedBody; } } @@ -1112,7 +1111,7 @@ public class MainActivity extends ThemedActivity /** * Set the string that will be shared into the new-post-editor * - * @param textToBeShared + * @param textToBeShared text that will be shared into the post-editor */ public void setTextToBeShared(String textToBeShared) { this.textToBeShared = textToBeShared; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java index 4d9e35d7..2047738b 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java @@ -330,9 +330,7 @@ public class DiasporaPodList implements Iterable, S } public DiasporaPod appendMainLangs(String... values) { - for (String mainLang : values) { - this.mainLangs.add(mainLang); - } + Collections.addAll(this.mainLangs, values); return this; } @@ -347,9 +345,7 @@ public class DiasporaPodList implements Iterable, S } public DiasporaPod appendPodUrls(DiasporaPodUrl... values) { - for (DiasporaPodUrl value : values) { - this.podUrls.add(value); - } + Collections.addAll(this.podUrls, values); return this; } @@ -411,7 +407,7 @@ public class DiasporaPodList implements Iterable, S /** * Get the base url * - * @return + * @return base url with port */ public String getBaseUrl() { return protocol + "://" + host + (isPortNeeded() ? port : ""); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/receiver/OpenExternalLinkReceiver.java b/app/src/main/java/com/github/dfa/diaspora_android/receiver/OpenExternalLinkReceiver.java index a5456703..622177ca 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/receiver/OpenExternalLinkReceiver.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/receiver/OpenExternalLinkReceiver.java @@ -53,7 +53,7 @@ public class OpenExternalLinkReceiver extends BroadcastReceiver { AppLog.v(this, "OpenExternalLinkReceiver.onReceive(): url"); - Uri url = null; + Uri url; try { String sUrl = receiveIntent.getStringExtra(MainActivity.EXTRA_URL); url = Uri.parse(sUrl); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/service/StatisticsFetchTask.java b/app/src/main/java/com/github/dfa/diaspora_android/service/StatisticsFetchTask.java deleted file mode 100644 index f06bcbd7..00000000 --- a/app/src/main/java/com/github/dfa/diaspora_android/service/StatisticsFetchTask.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - This file is part of the Diaspora for Android. - - Diaspora for Android 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. - - Diaspora for Android 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 the Diaspora for Android. - - If not, see . - */ -package com.github.dfa.diaspora_android.service; - -import android.content.Context; -import android.os.AsyncTask; -import android.webkit.CookieManager; - -import com.github.dfa.diaspora_android.App; -import com.github.dfa.diaspora_android.util.AppLog; -import com.github.dfa.diaspora_android.util.DiasporaUrlHelper; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; - -import javax.net.ssl.HttpsURLConnection; - -import info.guardianproject.netcipher.NetCipher; - -/** - * AsyncTask to fetch a users profile - */ -public class StatisticsFetchTask extends AsyncTask { - // Code for getting the profile async without any UI/WebView - // TODO: This is an early version,needs to be converted to Service - - private final App app; - private final Context context; - private final DiasporaUrlHelper urls; - - public StatisticsFetchTask(final App app) { - this.context = app.getApplicationContext(); - this.app = app; - this.urls = new DiasporaUrlHelper(app.getSettings()); - } - - - @Override - protected Void doInBackground(Void... params) { - String extractedProfileData = null; - final CookieManager cookieManager = app.getCookieManager(); - String cookies = cookieManager.getCookie(urls.getPodUrl()); - - HttpsURLConnection connection; - InputStream inStream; - try { - URL url = new URL(urls.getStatisticsUrl()); - connection = NetCipher.getHttpsURLConnection(url); - connection.setReadTimeout(10000); - connection.setConnectTimeout(15000); - connection.setRequestMethod("GET"); - if (cookies != null) { - connection.setRequestProperty("Cookie", cookies); - } - connection.connect(); - - inStream = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(inStream)); - String line; - while ((line = br.readLine()) != null) { - AppLog.d(this, "STATS: " + line); - } - - try { - br.close(); - inStream.close(); - } catch (IOException e) {/*Nothing*/} - - connection.disconnect(); - - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java index 3286d7ea..7e2beab2 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java @@ -36,12 +36,13 @@ import butterknife.OnClick; import butterknife.OnItemSelected; /** + * Dialog that helps the user configure a pod * Created by gsantner (https://gsantner.github.io) on 06.10.16. */ public class PodSelectionDialog extends ThemedAppCompatDialogFragment { public static final String TAG = "com.github.dfa.diaspora_android.ui.PodSelectionDialog"; - public static interface PodSelectionDialogResultListener { + public interface PodSelectionDialogResultListener { void onPodSelectionDialogResult(DiasporaPod pod, boolean accepted); } @@ -127,7 +128,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment { spinnerProfile.setVisibility(View.VISIBLE); String[] podUrlss = new String[podUrls.size()]; for (int i = 0; i < podUrls.size(); podUrlss[i] = podUrls.get(i++).getBaseUrl()) ; - ArrayAdapter spinnerAdapter = new ArrayAdapter(getContext(), android.R.layout.simple_spinner_item, podUrlss); + ArrayAdapter spinnerAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, podUrlss); spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinnerProfile.setAdapter(spinnerAdapter); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ColorPalette.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ColorPalette.java index d15000ad..d483605e 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ColorPalette.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ColorPalette.java @@ -8,6 +8,7 @@ import android.support.v4.graphics.ColorUtils; import com.github.dfa.diaspora_android.R; /** + * Class that handles Colors * Created by dnld on 24/02/16. */ public class ColorPalette { diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java index 4760168e..f926fd31 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java @@ -40,7 +40,6 @@ import android.widget.RadioGroup; import android.widget.TextView; import com.github.dfa.diaspora_android.R; -import com.github.dfa.diaspora_android.util.AppLog; import com.github.dfa.diaspora_android.util.AppSettings; /** diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java index 169f47ea..c01236c4 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java @@ -22,7 +22,6 @@ import android.annotation.TargetApi; import android.app.ActivityManager; import android.graphics.drawable.BitmapDrawable; import android.os.Build; -import android.support.v4.app.FragmentManager; import android.support.v7.app.AppCompatActivity; import com.github.dfa.diaspora_android.App; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java index 8da3790a..dbfe1843 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java @@ -10,6 +10,7 @@ import android.widget.CheckBox; import com.github.dfa.diaspora_android.util.AppSettings; /** + * CheckboxPreference that colors its checkbox with accent color * Created by vanitas on 24.10.16. */ diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceFragment.java index 9cb288cd..a3a96c5a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceFragment.java @@ -10,6 +10,7 @@ import com.github.dfa.diaspora_android.App; import com.github.dfa.diaspora_android.util.AppSettings; /** + * PreferenceFragment with a colored status bar * Created by vanitas on 24.10.16. */ diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java index fb2f7d39..92a83986 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java @@ -129,9 +129,9 @@ public class AppLog { public static Log instance; private AppSettings appSettings; - private DateFormat dateFormat; - private ArrayList logBuffer; - private ArrayList observers; + private final DateFormat dateFormat; + private final ArrayList logBuffer; + private final ArrayList observers; private Log() { this(null); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java index d1442a46..5c363fd1 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java @@ -172,7 +172,7 @@ public class AppSettings { // TODO: Remove legacy at some time ;) - public void upgradeLegacyPoddomain() { + private void upgradeLegacyPoddomain() { String legacy = getString(prefPod, R.string.pref_key__poddomain_legacy, ""); if (!legacy.equals("")) { DiasporaPod pod = new DiasporaPod(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java index c6059bd3..8b1766d7 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java @@ -86,7 +86,7 @@ public class Helpers { public static String readTextfileFromRawRessource(Context context, int rawRessourceId, String linePrefix, String linePostfix) { StringBuilder sb = new StringBuilder(); - String line = ""; + String line; BufferedReader br = null; linePrefix = linePrefix == null ? "" : linePrefix; linePostfix = linePostfix == null ? "" : linePostfix; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java index 20afcd07..8479efa3 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java @@ -29,11 +29,9 @@ import com.github.dfa.diaspora_android.activity.MainActivity; public class CustomWebViewClient extends WebViewClient { private final App app; - private WebView webView; public CustomWebViewClient(App app, WebView webView) { this.app = app; - this.webView = webView; } //Open non-diaspora links in customtab/external browser diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java index 1438f447..0821b94a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java @@ -24,6 +24,7 @@ import android.widget.ProgressBar; import com.github.dfa.diaspora_android.util.AppLog; /** + * WebChromeClient that handles sharing text to diaspora* * Created by vanitas on 26.09.16. */ diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/FileUploadWebChromeClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/FileUploadWebChromeClient.java index b1a6ce48..ae1df256 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/FileUploadWebChromeClient.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/FileUploadWebChromeClient.java @@ -24,6 +24,7 @@ import android.webkit.WebView; import android.widget.ProgressBar; /** + * WebChromeClient that allows uploading images * Created by vanitas on 26.09.16. */ @@ -35,11 +36,6 @@ public class FileUploadWebChromeClient extends ProgressBarWebChromeClient { this.fileUploadCallback = fileUploadCallback; } - @Override - public void onProgressChanged(WebView wv, int progress) { - super.onProgressChanged(wv, progress); - } - //For Android 4.1/4.2 only. DO NOT REMOVE! @SuppressWarnings("unused") protected void openFileChooser(ValueCallback uploadMsg, String acceptType, String capture) { diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabActivityHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabActivityHelper.java index 3af91173..b9f5c4c3 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabActivityHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabActivityHelper.java @@ -94,7 +94,7 @@ public class CustomTabActivityHelper { /** * Register a Callback to be called when connected or disconnected from the Custom Tabs Service * - * @param connectionCallback + * @param connectionCallback callback */ public void setConnectionCallback(ConnectionCallback connectionCallback) { this.mConnectionCallback = connectionCallback; diff --git a/app/src/main/res/drawable/ic_arrow_forward_black_48px.xml b/app/src/main/res/drawable/ic_arrow_forward_black_48px.xml deleted file mode 100644 index 30935e88..00000000 --- a/app/src/main/res/drawable/ic_arrow_forward_black_48px.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_email_colored_48px.xml b/app/src/main/res/drawable/ic_email_colored_48px.xml deleted file mode 100644 index c79ed6bc..00000000 --- a/app/src/main/res/drawable/ic_email_colored_48px.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_share_black_24px.xml b/app/src/main/res/drawable/ic_share_black_24px.xml deleted file mode 100644 index a1b46680..00000000 --- a/app/src/main/res/drawable/ic_share_black_24px.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_short_text_black_24px.xml b/app/src/main/res/drawable/ic_short_text_black_24px.xml deleted file mode 100644 index 178a0127..00000000 --- a/app/src/main/res/drawable/ic_short_text_black_24px.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-de/strings-preferences.xml b/app/src/main/res/values-de/strings-preferences.xml index 0e396a1d..c047506e 100644 --- a/app/src/main/res/values-de/strings-preferences.xml +++ b/app/src/main/res/values-de/strings-preferences.xml @@ -14,7 +14,6 @@ Navigations Slider Konfiguration der Sichtbarkeit von Einträgen im Navigation-Slider - Sichtbarkeit der Einträge Nutzer Generelles Administrator diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ccd5cf8e..9a74f481 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,7 +5,6 @@ *[geteilt durch #DiasporaForAndroid]* Aktualisieren - Ungelesene Benachrichtigung. Lesen? Einstellungen Benachrichtigungen @@ -29,16 +28,9 @@ Weitergesagt Angefangen zu teilen - Pod auswählen - Pod-Adresse eingeben - Pod-Adresse bestätigen - Pods durchsuchen… - Anmerkung: Die Podliste wird aus den sicheren Pods, die bei https://podupti.me gelistet sind generiert. - Bitte eine gültige Pod-Adresse (Url) eingeben Fehler: Konnte die Podliste nicht abfragen! Entschuldigung, du musst mit dem Internet verbunden sein, um fortzufahren. Bestätigung - Möchtest du wirklich \nhttps://%1$s\nals deinen Diaspora Pod auswählen? Möchtest du die App verlassen? Mehr @@ -67,9 +59,7 @@ In externem Browser öffnen… Linkadresse kopieren - Warnung: Proxy konnte nicht aktiviert werden… Konnte Bild nicht laden… - Alle Tags Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto gespeichert werden kann. Danach solltest du die Anwendung komplett schließen oder das Gerät neu starten. diff --git a/app/src/main/res/values-es/strings-preferences.xml b/app/src/main/res/values-es/strings-preferences.xml index e8ec679d..ac52090c 100644 --- a/app/src/main/res/values-es/strings-preferences.xml +++ b/app/src/main/res/values-es/strings-preferences.xml @@ -14,7 +14,6 @@ Control deslizante de navegación Control de visibilidad de las entradas en el cajón de navegación - Elemento visibilidad Usuario General Administrador diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 06d6670b..2131819f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -5,7 +5,6 @@ *[compartido vía #DiasporaForAndroid]* Recargar - Notificación sin leer. ¿Quieres leerla? Configuración Notificaciones @@ -29,16 +28,9 @@ Recompartido Empezado Compartir - Seleccionar Pod - Introduce el dominio del Pod - Confirma la url del Pod - Buscar por Pod… - Nota: La lista de Pods esta integrada por Pods seguros listados en https://podupti.me. Puedes ingresar en el campo de edición cualquier Pod no listado. - Por favor, introduce un nombre de dominio válido Error: ¡No se pudo recuperar la lista de pods! Lo sentimos, debe estar conectado a internet para continuar Confirmación - ¿Realmente desea usar\nhttps://%1$s\ncomo su Pod de Diaspora? ¿Desea salir? Más @@ -67,9 +59,7 @@ Abrir en un navegador externo… Copiar dirección al portapapeles - Advertencia: No se pudo establecer proxy de la red No se pudo cargar la imagen - Todas las etiquetas Debe conceder \"Permiso de Almacenamiento de Información\" para guardar capturas de pantalla. Después debe cerrar completamente la aplicación o reiniciar el teléfono. Si usted no permite el acceso al almacenamiento pero desea utilizar la función de captura de pantalla en un momento posterior, puede conceder el permiso más adelante. Por favor vaya a: ajustes del sistema - aplicaciones - Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\". Debe conceder \"Permiso de acceso al almacenamiento\" para guardar imágenes. Después, debe cerrar completamente la aplicación o reiniciar el aparato. Si usted no permite el almacenamiento pero quiere guardar imágenes en otro momento, puede conceder el permiso más tarde. Por favor abra: ajustes del sistema -aplicaciones- Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\". diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml index c788e28f..82535335 100644 --- a/app/src/main/res/values-fr/strings-preferences.xml +++ b/app/src/main/res/values-fr/strings-preferences.xml @@ -14,7 +14,6 @@ Barre de défilement Contrôles de la visibilité des entrées dans le volet de navigation - Visibilité de l’élément Utilisateur Général Admin diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8882b243..4c31d83c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -5,7 +5,6 @@ *[partagé via #DiasporaForAndroid]* Rafraîchir - Notifications non lues. Lire ? Paramètres Notifications @@ -29,16 +28,9 @@ Repartagés A commencé à partager - Selectionnez un Pod - Entrez le nom de domaine du pod - Confirmez l\'url du pod - Recherche de Pod… - Note : la liste est générée à partir de la liste des pods sécurisés depuis https://podupti.me. Vous pouvez entrer l\'url d\'un pod non listé. - Veuillez entrer un nom de domaine valide Erreur : impossible de récupérer la liste des pods ! Désolé, vous devez être connecté à Internet pour continuer Confirmation - Voulez-vous vraiment utiliser\nhttps://%1$s\ncomme pod Diaspora ? Souhaitez-vous quitter ? Plus @@ -67,9 +59,7 @@ Ouvrir dans un navigateur externe… Copier le lien dans le presse-papier - Attention: connexion au proxy impossible… Impossible de récupérer l\'image - Tout Tags Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder les captures d\'écrans. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez utiliser la fonctionnalité de prise de capture d\'écran plus tard, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \". Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder/téléverser les images. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez sauvegarder des images ultérieurement, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \". diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml index b7a73485..9a46ed7f 100644 --- a/app/src/main/res/values-it/strings-preferences.xml +++ b/app/src/main/res/values-it/strings-preferences.xml @@ -14,7 +14,6 @@ Menù di navigazione Controlla la visibilità degli elementi nel menù di navigazione - Visibilità degli elementi Tema e colori Scegli quali colori usare nell\'app diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3f22927f..ad491b59 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -5,7 +5,6 @@ *[condiviso con #DiasporaForAndroid]* Ricarica - C\'è una notifica non letta. La vuoi leggere? Impostazioni Notifiche @@ -29,16 +28,9 @@ Ha ricondiviso Ha iniziato a condividere con te - Seleziona pod - Inserisci dominio del pod - Conferma URL del pod - Ricerca per pod… - Nota: l\'elenco dei pod sicuri si trova su https://podupti.me. Si può inserire nel relativo campo qualsiasi pod non presente nell\'elenco. - Inserisci un dominio valido Errore: impossibile ottenere la lista dei pod! Devi essere connesso ad internet per proseguire Conferma - Vuoi veramente usare\nhttps://%1$s\ncome tuo pod di Diaspora? Vuoi veramente uscire? Altro @@ -66,9 +58,7 @@ Apri nel browser… Copia link negli appunti - Attenzione: impossibile impostare proxy di rete… Impossibile caricare immagine - Tutti i tag Devi garantire il permesso di accesso alla memoria per poter salvare gli screenshot. Dopodiché devi chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi usare la diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml index ed8f606e..9a13e1b7 100644 --- a/app/src/main/res/values-ja/strings-preferences.xml +++ b/app/src/main/res/values-ja/strings-preferences.xml @@ -14,7 +14,6 @@ ナビゲーション スライダー ナビゲーションドロワー内のエントリーの表示を制御します - アイテムの表示 テーマと色 アプリ全体で使用される色を制御します diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8892c0aa..def55c5c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -5,7 +5,6 @@ *[#DiasporaForAndroid でシェア]* 再読み込み - 未読の通知。読みますか? 設定 通知 @@ -29,16 +28,9 @@ リシェアしました シェアを始めました - ポッドを選択 - ポッドのドメインを入力 - ポッドの URL を確認 - ポッドの検索… - 注意: ポットリストは、https://podupti.me に記載されているセキュリティで保護されたポッドが表示されます。表示されていないポッドを編集フィールドに入力することができます。 - 有効なドメインを入力してください エラー: ポッドのリストを取得できませんでした! 申し訳ありません。続行するにはインターネットに接続する必要があります 確認 - Diaspora のポッドとして\nhttps://%1$s\nを使用してもよろしいですか? 終了しますか? さらに @@ -66,9 +58,7 @@ 外部ブラウザーで開く… リンクアドレスをクリップボードへコピー - 警告: ネットワーク プロキシを設定できませんでした… 画像を読み込むことができません - すべてのタグ スクリーン ショットを保存するために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後でスクリーン ショット機能を使用する場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。 画像を保存/アップロードするために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後で画像を保存したい場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index d1fc931a..9a062010 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -11,7 +11,6 @@ ಹುಡುಕಿ - ಪೋಡ್ ಆಯ್ಕೆಮಾಡಿಕೊಳ್ಳಿ ಹೊಸ ಪೊಸ್ಟ್ ಮೇಲಕ್ಕೆ ಹೋಗಿ @@ -21,6 +20,5 @@ ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಕೊಂಡಿಯನ್ನು ನಕಲಿಸಿ - ಎಲ್ಲಾ ಟ್ಯಾಗ್‌ಗಳು diff --git a/app/src/main/res/values-ml/strings-preferences.xml b/app/src/main/res/values-ml/strings-preferences.xml index 915109cd..87570707 100644 --- a/app/src/main/res/values-ml/strings-preferences.xml +++ b/app/src/main/res/values-ml/strings-preferences.xml @@ -14,7 +14,6 @@ നാവിഗേഷൻ സ്ലൈഡർ നാവിഗേഷൻ ഡ്രാവറിൽ കാണേണ്ട എൻട്രികൾ നിയന്ത്രിക്കൂ - ഇനത്തിന്റെ കാഴ്ച diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 27cc9ee0..2115e42e 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -5,7 +5,6 @@ *[ #DiasporaForAndroid ഉപയോഗിച്ച് ഷെയർ ചെയ്തത്]* റീലോഡ് - വായിക്കാത്ത അറിയിപ്പുകളുണ്ട്. വായിക്കുന്നുവോ? സജ്ജീകരണങ്ങൾ അറിയിപ്പുകൾ @@ -21,15 +20,9 @@ തിരയുക - പോഡ് തിരഞ്ഞെടുക്കുക - പോഡ് അഡ്രസ് രേഖപ്പെടുത്തുക - പോഡ് അഡ്രസ് ഉറപ്പാക്കുക - അറിയിപ്പ് : പോഡുകളുടെ ലിസ്റ്റ് https://podupti.me യിൽ നിന്നാണ്‌ ലഭിക്കുന്നത്. തിരുത്തൽ വരുത്താനുള്ളയിടത്തിൽ മറ്റു പോഡുകളുടെ അഡ്രസ് നൽകാം. - ശരിയായ ഒരു അഡ്രസ് നൽകുക തെറ്റ്: പോഡുകളുടെ ലിസ്റ്റ് ലഭിക്കുന്നില്ല! ക്ഷമിക്കണം, തുടരുവാൻ ഇൻറർനെറ്റുമായി ബന്ധപ്പെട്ടിരിക്കണം ഉറപ്പിക്കൽ - \nhttps://%1$s\nനിങ്ങളുടെ ഡയാസ്പൊറ പോഡായി ഉപയോഗിക്കണമെന്ന് ഉറപ്പാണോ? പുറത്തേക്കു പോകണമോ? കൂടുതൽ @@ -57,9 +50,7 @@ പുറമേയുള്ള ബ്രൗസറിൽ തുറക്കുക… ലിങ്ക് അഡ്രസ് ക്ലിപ്ബോർഡിലേക്ക് കോപ്പി ചെയ്യുക - മുന്നറിയിപ്പ്: നെറ്റ്‌വർക്ക് പ്രോക്സി സെറ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല… ചിത്രം ലോഡ്‌ ചെയ്യാൻ കഴിയുന്നില്ല - എല്ലാ ടാഗുകളും സ്‌ക്രീനിന്റെ ചിത്രങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾ \"സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം\" നൽകണം. അതിനുശേഷം താങ്കൾ പ്രയോഗത്തെ പൂർണമായും നിർത്തുകയോ മൊബൈൽ റീസ്റ്റാർട്ട് ചെയ്യുകയോ വേണം. സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം നൽകാതെ മറ്റൊരവസരത്തിൽ സ്‌ക്രീനിന്റെ ചിത്രത്തങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾക്ക് അപ്പോൾ അനുവാദം നൽകാം. ഇതിനായി സജ്ജീകരണങ്ങളിലെ പ്രയോഗങ്ങളിൽ നിന്ന് ഡയസ്പോറ തിരഞ്ഞെടുക്കുക. എന്നിട്ട്‌ അനുവാദങ്ങളിൽ \"റൈറ്റ് സ്റ്റോറേജ് അനുവാദം\" നൽകുക. ചിത്രങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾ \"സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം\" നൽകണം. അതിനുശേഷം താങ്കൾ പ്രയോഗത്തെ പൂർണമായും നിർത്തുകയോ മൊബൈൽ റീസ്റ്റാർട്ട് ചെയ്യുകയോ വേണം. സ്റ്റോറേജിൽ പ്രവേശിക്കാനുള്ള അനുവാദം നൽകാതെ മറ്റൊരവസരത്തിൽ ചിത്രത്തങ്ങൾ സൂക്ഷിക്കാൻ താങ്കൾക്ക് അപ്പോൾ അനുവാദം നൽകാം. ഇതിനായി സജ്ജീകരണങ്ങളിലെ പ്രയോഗങ്ങളിൽ നിന്ന് ഡയസ്പോറ തിരഞ്ഞെടുക്കുക. എന്നിട്ട്‌ അനുവാദങ്ങളിൽ \"റൈറ്റ് സ്റ്റോറേജ് അനുവാദം\" നൽകുക. diff --git a/app/src/main/res/values-nl/strings-preferences.xml b/app/src/main/res/values-nl/strings-preferences.xml index 403c2632..26eae97a 100644 --- a/app/src/main/res/values-nl/strings-preferences.xml +++ b/app/src/main/res/values-nl/strings-preferences.xml @@ -14,7 +14,6 @@ Navigatie Slider Bepalen zichtbaarheid van vermeldingen in de navigatie-lade - Item Zichtbaarheid Gebruiker Algemeen Beheer diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c31720f2..6276ae81 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -5,7 +5,6 @@ *[gedeeld door #DiasporaForAndroid]* Herladen - Ongelezen bericht. Wilt u het lezen? Instellingen Meldingen @@ -29,16 +28,9 @@ Opnieuw gedeeld Begonnen te delen - Selecteer Pod - Voer pod domein - Bevestigen pod url - Zoek Pod… - Opmerking: De podlijst is gevuld met beveiligde pods vermeld op https://podupti.me. U kunt in het bewerk veld elke pod invullen die niet in de lijst staat. - Voer een geldige domeinnaam in Fout: Kan niet de podlijst ophalen! Sorry, u moet verbinding met internet hebben om verder te gaan Bevestiging - Wilt u echt \nhttps://%1$s\n als uw Diaspora pod gebruiken? Wilt u afsluiten? Meer @@ -67,9 +59,7 @@ Geopend in externe browser… Link-adres kopiëren naar Klembord - Waarschuwing: Kan niet netwerk proxy instellen… Niet in staat om afbeelding te laden - Alle tags U moet machtegingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wil geven maar screenshot functie later wil gebruiken, kunt u de toestemming later geven. Open dan: systemsettings - apps - Diaspora. In de machtegings sectie kunt u machtegingen geven aan \"write storage permission\". U moet machtigingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wilt geven maar screenshot functie later wilt gebruiken, kunt u de toestemming later geven. Open dan: system settings - apps - Diaspora. In de machtigingssectie kunt u machtigingen geven aan \"write storage permission\". diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml index 30cb584b..d6a617ed 100644 --- a/app/src/main/res/values-pl/strings-preferences.xml +++ b/app/src/main/res/values-pl/strings-preferences.xml @@ -14,7 +14,6 @@ Pasek nawigacji Wybierz elementy widoczne w pasku nawigacji - Widoczność elementu Użytkownik Ogólne Administracja diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8225d985..d5d60199 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -5,7 +5,6 @@ *[udostępnione za pomocą #DiasporaForAndroid]* Odśwież - Nieprzeczytane powiadomienia. Chcesz je przeczytać? Ustawienia Powiadomienia @@ -29,16 +28,9 @@ Powtórzenia Zaczęli się z Tobą dzielić - Wybierz Pod - Wprowadź domenę poda - Potwierdzić adres url poda - Wyszukaj Pod… - Uwaga: Na liście znajdują się Pody dodane do https://podupti.me i wspierające bezpieczne połączenia. Możesz także podać adres jakiegokolwiek innego Poda. - Wprowadź prawidłową nazwę domeny Błąd: Nie można pobrać listy podów! Przepraszam, musisz być podłączony do Internetu, aby kontynuować Potwierdzenie - Czy naprawdę chcesz używać\nhttps://%1$s \njako Twój Pod Diaspory? Czy chcesz zakończyć? Więcej @@ -67,9 +59,7 @@ Otwórz w zewnętrznej przeglądarce… Skopiuj adres odnośnika do schowka - Ostrzeżenie: Nie udało się ustawić proxy… Nie udało się wczytać obrazu - Wszystkie tagi By móc zapisywać zrzuty ekranu musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - Diaspora. W sekcji uprawnień zaznacz \"Pamięć\". By móc zapisywać/wysyłać obrazy musisz nadać aplikacji uprawnienia do \"modyfikowania i usuwania zawartości karty SD\". Gdy to zrobisz powinieneś całkowicie zamknąć aplikację lub zrestartować urządzenie. Jeśli nie nadasz teraz tego uprawnienia, ale będziesz chciał zrobić to w przyszłości, otwórz Ustawienia - Aplikacje - Diaspora. W sekcji uprawnień zaznacz \"Pamięć\". diff --git a/app/src/main/res/values-pt-rBR/strings-preferences.xml b/app/src/main/res/values-pt-rBR/strings-preferences.xml index a806632f..48f62eaa 100644 --- a/app/src/main/res/values-pt-rBR/strings-preferences.xml +++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml @@ -14,7 +14,6 @@ Controle deslizante de navegação Visibilidade do controle de entradas na gaveta de navegação - Visibilidade de item diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 32f15890..7b76b05e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -5,7 +5,6 @@ *[compartilhado por #DiasporaForAndroid]* Atualizar - Notificação não lida. Quer ler? Opções Notificações @@ -21,15 +20,9 @@ Buscar - Selecione o Pod - Insira o domínio do Pod - Confirme a URL do Pod - OBS: A lista de pods é gerada por pods seguros do https://podupti.me. Você pode adicionar qualquer pod não listado. - Por favor insira um nome de domínio válido Erro: Não conseguimos recuperar a lista de pods! Desculpe, que você deve estar conectado à Internet para prosseguir Confirmação - Você realmente quer usar\nhttps://%1$s\no seu Pod diáspora? Deseja sair? Tags selecionadas @@ -55,9 +48,7 @@ Abrir em navegador externo… Copiar link para área de transferência - Aviso: Não foi possível definir proxy de rede… Não é possível carregar a imagem - Todas as tags Você deve conceder \"Permissão de armazenamento\" para salvar screenshots. Depois disso você deve fechar o app completamente ou reiniciar o telefone. Se você não permitir o acesso de armazenamento, mas deseja usar a função de captura de tela em um momento posterior, você pode conceder a permissão mais tarde. Por favor, abra: configurações - aplicativos - Diaspora. Na seção permissões, você pode conceder a permissão de armazenamento \"gravar\". Você deve conceder \"Permissão de armazenamento\" para salvar imagens. Depois disso você deve fechar o app completamente ou reiniciar o telefone. Se você não permitir o acesso de armazenamento, mas deseja salvar imagens em um momento posterior, você pode conceder a permissão mais tarde. Por favor, abra: configurações - aplicativos - Diaspora. Na seção permissões, você pode conceder a permissão de armazenamento \"gravar\". diff --git a/app/src/main/res/values-ru/strings-preferences.xml b/app/src/main/res/values-ru/strings-preferences.xml index 94a1c172..617c8b0e 100644 --- a/app/src/main/res/values-ru/strings-preferences.xml +++ b/app/src/main/res/values-ru/strings-preferences.xml @@ -14,7 +14,6 @@ Слайдер навигации Управление видимостью записей в ящике навигации - Видимость элемента Пользовательские Общие Для администраторов diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1fc87cd1..ee020da3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -5,7 +5,6 @@ *[опубликовано из #DiasporaForAndroid]* Перезагрузить - Непрочитанное уведомление. Хотите прочитать его? Настройки Уведомления @@ -29,16 +28,9 @@ Поделились Добавили вас - Выберите под - Введите адрес пода - Подтвердите URL пода - Поиска пода… - Примечание: список подов формируется на основании списка безопасных подов с https://podupti.me. Вы можете ввести в поле для ввода любой под не из списка. - Пожалуйста, введите корректное имя домена Ошибка: не удалось получить список подов! Извините, вы должны быть подключены к Интернету, чтобы продолжить Подтверждение - Вы действительно хотите использовать\nhttps://%1$s\nв качестве вашего пода в Диаспоре? Вы действительно хотите выйти? Дополнительно @@ -67,9 +59,7 @@ Открыть во внешнем браузере… Копировать адрес ссылки в буфер обмена - Предупреждение: Не удалось установить сетевой прокси… Не удается загрузить изображение - Все теги Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения скриншотов. После этого вы должны полностью закрыть приложение или перезагрузите телефон. Если вы не разрешаете доступ к хранилищу, но хотите использовать функцию скриншотов позже, можно предоставить разрешение позднее. Затем откройте: Системные настройки - приложения - Диаспора. В разделе разрешения можно предоставить «разрешение на запись в хранилище». Необходимо предоставить «Разрешение на доступ к хранилищу» для сохранения изображений. После этого вы должны полностью закрыть приложение или перезагрузите телефон. Если вы не разрешаете доступ к хранилищу, но хотите сохранять изображения позже, можно предоставить разрешение позднее. Затем откройте: Системные настройки - приложения - Диаспора. В разделе разрешения можно предоставить «разрешение на запись в хранилище». diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index cebddacb..7d3ba5e3 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,13 +5,10 @@ 16dp 8dp 16dp - 16dp - 8dp 45dp - 250dp 11sp diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index 8235cf8f..89297341 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -1,5 +1,4 @@ 1300 - 1500 diff --git a/app/src/main/res/values/strings-about.xml b/app/src/main/res/values/strings-about.xml index 7724f186..a7ba96b3 100644 --- a/app/src/main/res/values/strings-about.xml +++ b/app/src/main/res/values/strings-about.xml @@ -62,5 +62,4 @@ Tell me more https://github.com/HoraApps/LeafPic - Auch gibt es niemanden, der den Schmerz an sich liebt, sucht oder wünscht, nur, weil er Schmerz ist, es sei denn, es kommt zu zufälligen Umständen, in denen Mühen und Schmerz ihm große Freude bereiten können. Um ein triviales Beispiel zu nehmen, wer von uns unterzieht sich je anstrengender körperlicher Betätigung, außer um Vorteile daraus zu ziehen? Aber wer hat irgend ein Recht, einen Menschen zu tadeln, der die Entscheidung trifft, eine Freude zu genießen, die keine unangenehmen Folgen hat, oder einen, der Schmerz vermeidet, welcher keine daraus resultierende Freude nach sich zieht? Auch gibt es niemanden, der den Schmerz an sich liebt, sucht oder wünscht, nur, weil er Schmerz ist, es sei denn, es kommt zu zufälligen Umständen, in denen Mühen und Schmerz ihm große Freude bereiten können. Um ein triviales Beispiel zu nehmen, wer von uns unterzieht sich je anstrengender körperlicher Betätigung, außer um Vorteile daraus zu ziehen? Aber wer hat irgend ein Recht, einen Menschen zu tadeln, der die Entscheidung trifft, eine Freude zu genießen, die keine unangenehmen Folgen hat, oder einen, der Schmerz vermeidet, welcher keine daraus resultierende Freude nach sich zieht? diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml index 8f3f77f6..89bb1126 100644 --- a/app/src/main/res/values/strings-preferences.xml +++ b/app/src/main/res/values/strings-preferences.xml @@ -5,13 +5,10 @@ pref_key__current_pod_0 pref_key_font_size pref_key_intellihide_toolbars - pref_key_category_pod_settings - pref_key_category_visuals pref_key_personal_settings pref_key_manage_tags pref_key_manage_contacts pref_key_change_account - pref_key_category_network pref_key_load_images pref_key_clear_cache pref_key__chrome_custom_tabs_enabled @@ -33,7 +30,6 @@ wasProxyEnabled - pref_catkey__visibility_navslider pref_key__visibility_navslider__exit pref_key__visibility_nav__help_license pref_key__visibility_nav__public_activities @@ -59,7 +55,6 @@ podUserProfile_NotificationCount - pref_catkey__category_more pref_key__logging_spam_enabled pref_key__logging_enabled pref_key__wipe_settings @@ -74,7 +69,6 @@ Navigation Slider Control visibility of entries in the navigation drawer - Item visibility User General Admin @@ -175,7 +169,6 @@ pref_key__title__network pref_key__title__more pref_key__title__debugging - pref_key__title__visibility_nav pref_key__title__proxy pref_key__title__themes diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46d3b243..211d206c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,11 +9,9 @@ - https:// Open navigation drawer Close navigation drawer Reload - Unread notification. Want to read it? Settings @@ -42,17 +40,10 @@ - Select Pod - Enter pod domain - Confirm pod url - Search for Pod… - Note: The podlist is populated by secure pods listed on https://podupti.me. You can enter in the edit field any pod not listed. - Please enter a valid domain name Error: Could not retrieve list of pods! Sorry, you must be connected to the Internet to proceed Confirmation - Do you really want to use\nhttps://%1$s\nas your Diaspora Pod? Do you want to exit? @@ -64,7 +55,6 @@ @string/activities @string/aspects @string/profile - @string/settings More About | Help Followed Tags @@ -102,9 +92,7 @@ - Warning: Could not set network proxy… Unable to load image - All tags You must grant \"Access Storage Permission\" to save screenshots. After that you should