Merge branch 'develop'

This commit is contained in:
stom79 2018-02-26 14:20:36 +01:00
commit 7052231c5f
15 changed files with 291 additions and 265 deletions

View File

@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion "27.0.3"
defaultConfig {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
targetSdkVersion 27
versionCode 114
versionName "1.8.2"
versionCode 115
versionName "1.8.3"
}
flavorDimensions "default"
buildTypes {
@ -34,21 +34,37 @@ allprojects {
maven { url "https://maven.google.com"}
}
}
ext.supportLibraryVersion = '27.0.2'
ext.glideLibraryVersion = '4.6.1'
ext.conscryptLibraryVersion = '1.0.1'
ext.evernoteLibraryVersion = '1.2.2'
ext.gsonLibraryVersion = '2.8.2'
ext.guavaLibraryVersion = '23.6-android'
ext.photoViewLibraryVersion = '2.0.0'
ext.swipebackLibraryVersion = '1.0.2'
ext.ratethisappLibraryVersion = '1.2.0'
dependencies {
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:support-v4:27.0.2'
implementation 'com.android.support:recyclerview-v7:27.0.2'
implementation 'com.github.bumptech.glide:glide:4.5.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
implementation 'com.evernote:android-job:1.2.2'
implementation 'com.github.chrisbanes:PhotoView:2.0.0'
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
implementation "com.android.support:design:$supportLibraryVersion"
implementation "com.android.support:support-v4:$supportLibraryVersion"
implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
implementation "com.android.support:customtabs:$supportLibraryVersion"
implementation "com.github.bumptech.glide:glide:$glideLibraryVersion"
annotationProcessor "com.github.bumptech.glide:compiler:$glideLibraryVersion"
implementation "org.conscrypt:conscrypt-android:$conscryptLibraryVersion"
implementation "com.evernote:android-job:$evernoteLibraryVersion"
implementation "com.google.code.gson:gson:$gsonLibraryVersion"
implementation "com.google.guava:guava:$guavaLibraryVersion"
implementation "com.github.chrisbanes:PhotoView:$photoViewLibraryVersion"
implementation "com.gongwen:swipeback:$swipebackLibraryVersion"
implementation 'com.github.stom79:country-picker-android:1.2.0'
implementation 'com.github.stom79:mytransl:1.4'
playstoreImplementation 'io.github.kobakei:ratethisapp:1.2.0'
implementation 'org.conscrypt:conscrypt-android:1.0.0.RC13'
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.guava:guava:23.6-android'
implementation 'com.gongwen:swipeback:1.0.2'
implementation 'com.android.support:customtabs:27.0.2'
playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
}

View File

@ -309,7 +309,7 @@ public class LoginActivity extends BaseActivity {
startActivity(i);
}else{
String url = redirectUserToAuthorizeAndLogin(client_id, instance);
Helper.openBrowser(getApplicationContext(), url);
Helper.openBrowser(LoginActivity.this, url);
}
}
} catch (JSONException ignored) {ignored.printStackTrace();}

View File

@ -668,7 +668,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
try {
File photoFiletmp = createImageFile(false);
InputStream inputStream = getContentResolver().openInputStream(fileUri);
OutputStream output = new FileOutputStream(photoFile);
OutputStream output = new FileOutputStream(photoFiletmp);
try {
byte[] buffer = new byte[4 * 1024]; // or other buffer size
int read;
@ -684,6 +684,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
new asyncPicture(TootActivity.this, photoFiletmp).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
count++;
} catch (Exception e) {
e.printStackTrace();
Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show();
toot_picture.setEnabled(true);
}

View File

@ -26,7 +26,7 @@ import android.database.sqlite.SQLiteOpenHelper;
public class Sqlite extends SQLiteOpenHelper {
public static final int DB_VERSION = 10;
public static final int DB_VERSION = 11;
public static final String DB_NAME = "mastodon_etalab_db";
public static SQLiteDatabase db;
private static Sqlite sInstance;
@ -155,6 +155,9 @@ public class Sqlite extends SQLiteOpenHelper {
+ COL_MENTIONS + " TEXT, " + COL_TAGS + " TEXT, " + COL_APPLICATION + " TEXT,"
+ COL_LANGUAGE + " TEXT," + COL_PINNED + " INTEGER)";
private final String CREATE_UNIQUE_CACHE_INDEX = "CREATE UNIQUE INDEX instance_statusid on "
+ TABLE_STATUSES_CACHE + "(" + COL_INSTANCE +"," + COL_STATUS_ID + ")";
public Sqlite(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
super(context, name, factory, version);
@ -177,6 +180,7 @@ public class Sqlite extends SQLiteOpenHelper {
db.execSQL(CREATE_TABLE_SEARCH);
db.execSQL(CREATE_TABLE_TEMP_MUTE);
db.execSQL(CREATE_TABLE_STATUSES_CACHE);
db.execSQL(CREATE_UNIQUE_CACHE_INDEX);
}
@Override
@ -205,6 +209,11 @@ public class Sqlite extends SQLiteOpenHelper {
case 9:
db.execSQL("DROP TABLE IF EXISTS " + TABLE_STATUSES_CACHE);
db.execSQL(CREATE_TABLE_STATUSES_CACHE);
case 10:
//Table cache is deleted to avoid error during migration
db.execSQL("DROP TABLE IF EXISTS " + TABLE_STATUSES_CACHE);
db.execSQL(CREATE_TABLE_STATUSES_CACHE);
db.execSQL(CREATE_UNIQUE_CACHE_INDEX);
default:
break;
}

View File

@ -202,10 +202,10 @@
<string name="remove_scheduled">هل تود حذف التبويق المُبرمَج ؟</string>
<string name="media_count">الوسائط : %d</string>
<string name="toot_scheduled">تمت برمجة التبويق بنجاح !</string>
<string name="toot_scheduled_date">The scheduled date must be greater than the current hour!</string>
<string name="toot_scheduled_date">يجب أن يكون تاريخ البرمجة أكبر من الساعة الحالية !</string>
<string name="warning_battery">وضع توفير الطاقة على البطارية مشغَّل ! مِن المحتمل ألا يعمل كالمعتاد.</string>
<!-- timed mute -->
<string name="timed_mute_date_error">The time for muting should be greater than one minute.</string>
<string name="timed_mute_date_error">ينبغي أن يكون وقت الكتم أكبر من دقيقة واحدة.</string>
<string name="timed_mute_date">%1$s مكتوم إلى غاية %2$s.\n بإمكانك إلغاء كتم حساب المستخدم على صفحة ملفه الشخصي.</string>
<string name="timed_mute_profile">%1$s مكتوم إلى غاية %2$s.\n بإمكانك إلغاء كتم حساب المستخدم بالنقر هنا.</string>
<!-- Notifications -->
@ -370,8 +370,8 @@
<!-- Quick settings for notifications -->
<string name="settings_popup_title">الإخطارات المدفوعة</string>
<string name="settings_popup_message">
Please, confirm push notifications that you want to receive.
You can enable or disable these notifications later in settings (Notifications tab).
الرجاء التأكّد مِن الإشعارات المدفوعة التي تودّ تلقيها.
بإمكانك تفعيل أو تعطيل هذه الإشعارات لاحقًا عبر الإعدادات (في تبويب الإخطارات).
</string>
<string name="settings_popup_timeline">للتبويقات غير المقروءة على الخط الزمني الرئيسي ؟</string>
<string name="settings_popup_notification">للإشعارات غير المقروءة ؟</string>

View File

@ -1,106 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="navigation_drawer_open">Open the menu</string>
<string name="navigation_drawer_close">Close the menu</string>
<string name="action_about">About</string>
<string name="action_about_instance">About the instance</string>
<string name="action_privacy">Privacy</string>
<string name="action_cache">Cache</string>
<string name="action_logout">Logout</string>
<string name="login">Login</string>
<string name="navigation_drawer_open">Obre el menú</string>
<string name="navigation_drawer_close">Tanca el menú</string>
<string name="action_about">Quant a</string>
<string name="action_about_instance">Quant a la instància</string>
<string name="action_privacy">Privadesa</string>
<string name="action_cache">Memòria cau</string>
<string name="action_logout">Tanca la sessió</string>
<string name="login">Inicia la sessió</string>
<!-- common -->
<string name="close">Close</string>
<string name="yes">Yes</string>
<string name="close">Tanca</string>
<string name="yes"></string>
<string name="no">No</string>
<string name="cancel">Cancel</string>
<string name="download">Download</string>
<string name="download_file">Download %1$s</string>
<string name="download_over">Download complete</string>
<string name="save_file">Save %1$s</string>
<string name="save_over">Media saved</string>
<string name="download_from" formatted="false">File: %1$s</string>
<string name="password">Password</string>
<string name="email">Email</string>
<string name="accounts">Accounts</string>
<string name="cancel">Cancel·la</string>
<string name="download">Baixa</string>
<string name="download_file">Baixa %1$s</string>
<string name="download_over">La baixada ha finalitzat</string>
<string name="save_file">Desa %1$s</string>
<string name="save_over">S\'ha desat l\'element multimèdia</string>
<string name="download_from" formatted="false">Fitxer: %1$s</string>
<string name="password">Contrasenya</string>
<string name="email">Adreça electrònica</string>
<string name="accounts">Comptes</string>
<string name="toots">Toots</string>
<string name="tags">Tags</string>
<string name="token">Token</string>
<string name="save">Save</string>
<string name="restore">Restore</string>
<string name="two_factor_authentification">Two-step authentication?</string>
<string name="tags">Etiquetes</string>
<string name="token">Identificador</string>
<string name="save">Desa</string>
<string name="restore">Restaura</string>
<string name="two_factor_authentification">Autenticació de dos factors?</string>
<string name="other_instance">Other instance than mastodon.etalab.gouv.fr?</string>
<string name="no_result">No results!</string>
<string name="instance">Instance</string>
<string name="instance_example">Instance: mastodon.social</string>
<string name="toast_account_changed" formatted="false">Now works with the account %1$s</string>
<string name="add_account">Add an account</string>
<string name="clipboard">The content of the toot has been copied to the clipboard</string>
<string name="change">Change</string>
<string name="choose_picture">Select a picture…</string>
<string name="clear">Clean</string>
<string name="microphone">Microphone</string>
<string name="camera">Camera</string>
<string name="speech_prompt">Please, say something</string>
<string name="speech_not_supported">Sorry! Your device does not support the voice input!</string>
<string name="delete_all">Delete all</string>
<string name="translate_toot">Translate this toot.</string>
<string name="schedule">Schedule</string>
<string name="text_size">Text and icon sizes</string>
<string name="text_size_change">Change the current text size:</string>
<string name="icon_size_change">Change the current icon size:</string>
<string name="next">Next</string>
<string name="previous">Previous</string>
<string name="open_with">Open with</string>
<string name="validate">Validate</string>
<string name="media">Media</string>
<string name="share_with">Share with</string>
<string name="shared_via">Shared via Mastalab</string>
<string name="replies">Replies</string>
<string name="username">User name</string>
<string name="drafts">Drafts</string>
<string name="no_result">No hi ha cap resultat!</string>
<string name="instance">Instància</string>
<string name="instance_example">Intància: mastodon.social</string>
<string name="toast_account_changed" formatted="false">Ara funciona amb el compte %1$s</string>
<string name="add_account">Afegeix un compte</string>
<string name="clipboard">El contingut del toot s\'ha copiat al porta-retalls</string>
<string name="change">Canvia</string>
<string name="choose_picture">Seleccioneu una imatge...</string>
<string name="clear">Neteja</string>
<string name="microphone">Micròfon</string>
<string name="camera">Càmera</string>
<string name="speech_prompt">Digueu quelcom</string>
<string name="speech_not_supported">El vostre aparell sembla que no permet la introducció de veu!</string>
<string name="delete_all">Suprimeix-ho tot</string>
<string name="translate_toot">Tradueix aquest toot.</string>
<string name="schedule">Planifica</string>
<string name="text_size">Mides del text i la icona</string>
<string name="text_size_change">Canvia la mida del text actual:</string>
<string name="icon_size_change">Canvia la mida de la icona actual:</string>
<string name="next">Endavant</string>
<string name="previous">Enrere</string>
<string name="open_with">Obre amb</string>
<string name="validate">Valida</string>
<string name="media">Multimèdia</string>
<string name="share_with">Comparteix amb</string>
<string name="shared_via">Comparteix via Mastalab</string>
<string name="replies">Respostes</string>
<string name="username">Nom d\'usuari</string>
<string name="drafts">Esborranys</string>
<string name="new_data">New data are available! Do you want to display them?</string>
<string name="favourite">Favourites</string>
<string name="follow">New followers</string>
<string name="mention">Mentions</string>
<string name="favourite">Preferits</string>
<string name="follow">Seguidors nous</string>
<string name="mention">Mencions</string>
<string name="reblog">Boosts</string>
<string name="show_boosts">Show boosts</string>
<string name="show_replies">Show replies</string>
<string name="action_open_in_web">Open in browser</string>
<string name="translate">Translate</string>
<string name="show_replies">Mostra les respostes</string>
<string name="action_open_in_web">Obre al navegador</string>
<string name="translate">Tradueix</string>
<string name="please_wait">Please, wait few seconds before making this action.</string>
<!--- Menu -->
<string name="home_menu">Home</string>
<string name="home_menu">Inici</string>
<string name="local_menu">Local timeline</string>
<string name="global_menu">Federated timeline</string>
<string name="neutral_menu_title">Options</string>
<string name="favorites_menu">Favourites</string>
<string name="communication_menu_title">Communication</string>
<string name="muted_menu">Muted users</string>
<string name="blocked_menu">Blocked users</string>
<string name="neutral_menu_title">Opcions</string>
<string name="favorites_menu">Preferits</string>
<string name="communication_menu_title">Comunicació</string>
<string name="muted_menu">Usuaris silenciats</string>
<string name="blocked_menu">Usuaris blocats</string>
<string name="remote_follow_menu">Remote follow</string>
<string name="notifications">Notifications</string>
<string name="follow_request">Follow requests</string>
<string name="optimization">Optimization</string>
<string name="settings">Settings</string>
<string name="profile">Profile</string>
<string name="make_a_choice">What do you want to do?</string>
<string name="delete_account_title">Delete an account</string>
<string name="notifications">Notificacions</string>
<string name="follow_request">Peticions de seguiment</string>
<string name="optimization">Optimització</string>
<string name="settings">Configuració</string>
<string name="profile">Perfil</string>
<string name="make_a_choice">Què vols fer?</string>
<string name="delete_account_title">Suprimeix un compte</string>
<string name="delete_account_message" formatted="false">Delete the account %1$s from the application?</string>
<string name="send_email">Send an email</string>
<string name="choose_file">Please select a file</string>
<string name="send_email">Envia un correu electrònic</string>
<string name="choose_file">Selecciona un fitxer</string>
<string name="choose_file_error">No file explorer found!</string>
<string name="click_to_change">Click on the path to change it</string>
<string name="failed">Failed!</string>
<string name="scheduled_toots">Scheduled toots</string>
<string name="failed">Ha fallat!</string>
<string name="scheduled_toots">Toots planificats</string>
<string name="disclaimer_full">Information below may reflect the user\'s profile incompletely.</string>
<string name="insert_emoji">Insert emoji</string>
<string name="insert_emoji">Insereix un emoji</string>
<string name="no_emoji">The app did not collect custom emojis for the moment.</string>
<string name="live_notif">Live notifications</string>
<string name="live_notif">Notificacions en directe</string>
<!-- Status -->
<string name="no_status">No toot to display</string>
<string name="fav_added">The toot was added to favourites</string>
<string name="fav_removed">The toot was removed from favourites!</string>
<string name="fav_added">El toot s\'ha afegit als preferits</string>
<string name="fav_removed">El toot s\'ha suprimit dels preferits!</string>
<string name="reblog_added">The toot was boosted!</string>
<string name="reblog_removed">The toot is no longer boosted!</string>
<string name="reblog_by">Boosted by %1$s</string>
@ -108,54 +108,54 @@
<string name="favourite_remove">Remove this toot from your favourites?</string>
<string name="reblog_add">Boost this toot?</string>
<string name="reblog_remove">Unboost this toot?</string>
<string name="pin_add">Pin this toot?</string>
<string name="pin_remove">Unpin this toot?</string>
<string name="more_action_1">Mute</string>
<string name="more_action_2">Block</string>
<string name="more_action_3">Report</string>
<string name="more_action_4">Remove</string>
<string name="more_action_5">Copy</string>
<string name="more_action_6">Share</string>
<string name="more_action_7">Mention</string>
<string name="more_action_8">Timed mute</string>
<string name="pin_add">Vols fixar aquest toot?</string>
<string name="pin_remove">Vols deixar de fixar aquest toot?</string>
<string name="more_action_1">Silencia</string>
<string name="more_action_2">Bloca</string>
<string name="more_action_3">Denuncia</string>
<string name="more_action_4">Suprimeix</string>
<string name="more_action_5">Copia</string>
<string name="more_action_6">Comparteix</string>
<string name="more_action_7">Menciona</string>
<string name="more_action_8">Silencia temporalment</string>
<string-array name="more_action_confirm">
<item>Mute this account?</item>
<item>Block this account?</item>
<item>Report this toot?</item>
<item>Vols silenciar aquest compte?</item>
<item>Vols blocar aquest compte?</item>
<item>Vols denunciar aquest toot?</item>
</string-array>
<string-array name="more_action_owner_confirm">
<item>Remove this toot?</item>
<item>Vols suprimir aquest toot?</item>
</string-array>
<plurals name="preview_replies">
<item quantity="one">%d reply</item>
<item quantity="other">%d replies</item>
</plurals>
<string name="bookmarks">Bookmarks</string>
<string name="bookmarks_empty">No bookmarks to display</string>
<string name="status_bookmarked">Status has been added to bookmarks!</string>
<string name="status_unbookmarked">Status was removed from bookmarks!</string>
<string name="bookmarks">Marcadors</string>
<string name="bookmarks_empty">No hi ha cap marcador per a mostrar</string>
<string name="status_bookmarked">L\'estat s\'ha afegit als marcadors!</string>
<string name="status_unbookmarked">L\'estat s\'ha suprimit dels marcadors!</string>
<!-- Date -->
<string name="date_seconds">%d s</string>
<string name="date_minutes">%d m</string>
<string name="date_hours">%d h</string>
<string name="date_day">%d d</string>
<string name="date_day">%d d.</string>
<!-- TOOT -->
<string name="toot_cw_placeholder">Warning</string>
<string name="toot_placeholder">What is on your mind?</string>
<string name="toot_cw_placeholder">Atenció</string>
<string name="toot_placeholder">En què estàs pensant?</string>
<string name="toot_it">TOOT!</string>
<string name="cw">cw</string>
<string name="toot_title">Write a toot</string>
<string name="toot_title_reply">Reply to a toot</string>
<string name="toot_title">Escriu un toot</string>
<string name="toot_title_reply">Respon un toot</string>
<string name="toot_no_space">You have reached the 500 characters allowed!</string>
<string name="toot_select_image">Select a media</string>
<string name="toot_select_image_error">An error occurred while selecting the media!</string>
<string name="toot_delete_media">Delete this media?</string>
<string name="toot_error_no_content">Your toot is empty!</string>
<string name="toot_visibility_tilte">Visibility of the toot</string>
<string name="toots_visibility_tilte">Visibility of the toots by default: </string>
<string name="toot_sent">The toot has been sent!</string>
<string name="toot_reply_content_title">You are replying to this toot:</string>
<string name="toot_sensitive">Sensitive content?</string>
<string name="toot_delete_media">Vols suprimir aquest element multimèdia?</string>
<string name="toot_error_no_content">El toot és buit!</string>
<string name="toot_visibility_tilte">Visibilitat del toot</string>
<string name="toots_visibility_tilte">Visibilitat predeterminada dels toots: </string>
<string name="toot_sent">S\'ha enviat el toot!</string>
<string name="toot_reply_content_title">Estàs responent aquest toot:</string>
<string name="toot_sensitive">Això és contingut sensible?</string>
<string-array name="toot_visibility">
<item>Post to public timelines</item>
<item>Do not post to public timelines</item>
@ -172,26 +172,26 @@
<!-- Instance -->
<string name="instance_no_description">No description available!</string>
<!-- About -->
<string name="about_vesrion">Release %1$s</string>
<string name="about_developer">Developer:</string>
<string name="about_license">License: </string>
<string name="about_vesrion">Versió %1$s</string>
<string name="about_developer">Desenvolupador:</string>
<string name="about_license">Llicència: </string>
<string name="about_license_action">GNU GPL V3</string>
<string name="about_code">Source code: </string>
<string name="about_yandex">Translation of toots:</string>
<string name="about_code">Codi font: </string>
<string name="about_yandex">Traducció dels toots:</string>
<string name="about_thekinrar">Search instances:</string>
<string name="about_thekinrar_action">instances.social</string>
<string name="thanks_text_logo">Icon designer:</string>
<string name="thanks_text_logo">Disseny de la icona:</string>
<!-- Conversation -->
<string name="conversation">Conversation</string>
<string name="conversation">Conversa</string>
<!-- Accounts -->
<string name="no_accounts">No account to display</string>
<string name="no_follow_request">No follow request</string>
<string name="no_accounts">No hi ha cap compte per mostrar</string>
<string name="no_follow_request">No hi ha cap petició de seguiment</string>
<string name="status_cnt">Toots \n %1$s</string>
<string name="following_cnt">Following \n %1$s</string>
<string name="followers_cnt">Followers \n %1$s</string>
<string name="pins_cnt">Pinned \n %d</string>
<string name="authorize">Authorize</string>
<string name="reject">Reject</string>
<string name="authorize">Autoritza</string>
<string name="reject">Rebutja</string>
<!-- Scheduled toots -->
<string name="no_scheduled_toots">No scheduled toot to display!</string>
<string name="no_scheduled_toots_indications">Write a toot and then choose <b>Schedule</b> from the top menu.</string>
@ -205,11 +205,11 @@
<string name="timed_mute_date">%1$s has been muted until %2$s.\n You can unmute this account from his/her profile page.</string>
<string name="timed_mute_profile">%1$s is muted until %2$s.\n Click here to unmute the account.</string>
<!-- Notifications -->
<string name="no_notifications">No notification to display</string>
<string name="notif_mention">mentioned you</string>
<string name="no_notifications">No hi ha cap notificació per mostrar</string>
<string name="notif_mention">et menciona</string>
<string name="notif_reblog">boosted your status</string>
<string name="notif_favourite">favourited your status</string>
<string name="notif_follow">followed you</string>
<string name="notif_follow">et segueix</string>
<string name="notif_pouet">New toot from %1$s</string>
<plurals name="other_notifications">
<item quantity="one">and another notification</item>
@ -219,32 +219,32 @@
<item quantity="one">and another toot to discover</item>
<item quantity="other">and %d other toots to discover</item>
</plurals>
<string name="delete_notification_ask">Delete a notification?</string>
<string name="delete_notification_ask_all">Delete all notifications?</string>
<string name="delete_notification">The notification has been deleted!</string>
<string name="delete_notification_all">All notifications have been deleted!</string>
<string name="delete_notification_ask">Vols suprimir la notificació?</string>
<string name="delete_notification_ask_all">Vols suprimir totes les notificacions?</string>
<string name="delete_notification">S\'ha suprimit la notificació!</string>
<string name="delete_notification_all">S\'han suprimit totes les notificacions!</string>
<!-- HEADER -->
<string name="following">Following</string>
<string name="followers">Followers</string>
<string name="pinned_toots">Pinned</string>
<string name="following">Seguits</string>
<string name="followers">Seguidors</string>
<string name="pinned_toots">Fixat</string>
<!-- TOAST -->
<string name="client_error">Unable to get client id!</string>
<string name="no_internet">No Internet connection!</string>
<string name="toast_block">The account was blocked!</string>
<string name="client_error">No s\'ha pogut obtenir la id del client!</string>
<string name="no_internet">No hi ha connexió a internet!</string>
<string name="toast_block">El compte s\'ha blocat!</string>
<string name="toast_unblock">The account is no longer blocked!</string>
<string name="toast_mute">The account was muted!</string>
<string name="toast_unmute">The account is no longer muted!</string>
<string name="toast_mute">El compte s\'ha silenciat!</string>
<string name="toast_unmute">El compte ja no està silenciat!</string>
<string name="toast_follow">The account was followed!</string>
<string name="toast_unfollow">The account is no longer followed!</string>
<string name="toast_reblog">The toot was boosted!</string>
<string name="toast_unreblog">The toot is no longer boosted!</string>
<string name="toast_favourite">The toot was added to your favourites!</string>
<string name="toast_unfavourite">The toot was removed from your favourites!</string>
<string name="toast_report">The toot was reported!</string>
<string name="toast_unstatus">The toot was deleted!</string>
<string name="toast_pin">The toot was pinned!</string>
<string name="toast_unpin">The toot was unpinned!</string>
<string name="toast_error">Oops ! An error occurred!</string>
<string name="toast_report">S\'ha denunciat el toot!</string>
<string name="toast_unstatus">S\'ha suprimit el toot!</string>
<string name="toast_pin">S\'ha fixat el toot!</string>
<string name="toast_unpin">S\'ha deixat de fixar el toot!</string>
<string name="toast_error">Ep! S\'ha produït un error!</string>
<string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
<string name="toast_error_instance">The instance domain does not seem to be valid!</string>
<string name="toast_error_loading_account">An error occurred while switching between accounts!</string>
@ -254,7 +254,7 @@
<string name="nothing_to_do">No action can be taken</string>
<string name="toast_saved">The media has been saved!</string>
<string name="toast_error_translate">An error occurred while translating!</string>
<string name="toast_toot_saved">Draft saved!</string>
<string name="toast_toot_saved">S\'ha desat l\'esborrany!</string>
<string name="toast_error_char_limit">Are you sure this instance allows this number of characters? Usually, this value is close to 500 characters.</string>
<string name="toast_visibility_changed">Visibility of the toots has been changed for the account %1$s</string>
<string name="toast_empty_search">Instance name and screen name cannot be blank!</string>
@ -263,23 +263,23 @@
<string name="set_toots_page">Number of toots per load</string>
<string name="set_accounts_page">Number of accounts per load</string>
<string name="set_notifications_page">Number of notifications per load</string>
<string name="set_attachment_always">Always</string>
<string name="set_attachment_wifi">WIFI</string>
<string name="set_attachment_always">Sempre</string>
<string name="set_attachment_wifi">Wi-Fi</string>
<string name="set_attachment_ask">Ask</string>
<string name="set_attachment_action">Load the media</string>
<string name="load_attachment">Load the pictures</string>
<string name="load_attachment_spoiler">Show more…</string>
<string name="load_attachment_spoiler_less">Show less…</string>
<string name="load_attachment_spoiler">Mostra\'n més...</string>
<string name="load_attachment_spoiler_less">Mostra\'n menys...</string>
<string name="load_sensitive_attachment">Sensitive content</string>
<string name="set_display_reply">Display previous message in responses</string>
<string name="set_display_local">Display local timeline</string>
<string name="set_display_global">Display federated timeline</string>
<string name="set_disable_gif">Disable GIF avatars</string>
<string name="set_folder_title">Path: </string>
<string name="set_auto_store_toot">Save drafts automatically</string>
<string name="set_bubble_counter">Display counters</string>
<string name="set_disable_gif">Desactiva els avatars GIF</string>
<string name="set_folder_title">Camí: </string>
<string name="set_auto_store_toot">Desa els esborrany automàticament</string>
<string name="set_bubble_counter">Mostra els comptadors</string>
<string name="set_auto_add_media_url">Add URL of media in toots</string>
<string name="settings_title_notifications">Manage notifications</string>
<string name="settings_title_notifications">Gestiona les notificacions</string>
<string name="set_notif_follow">Notify when someone follows you</string>
<string name="set_notif_follow_ask">Notify when someone requests to follow you</string>
<string name="set_notif_follow_share">Notify when someone boosts your status</string>
@ -287,15 +287,15 @@
<string name="set_notif_follow_mention">Notify when someone mentions you</string>
<string name="set_share_validation">Show confirmation dialog before boosting</string>
<string name="set_share_validation_fav">Show confirmation dialog before adding to favourites</string>
<string name="settings_title_more_options">Advanced settings</string>
<string name="settings_title_more_options">Configuració avançada</string>
<string name="set_wifi_only">Notify in WIFI only</string>
<string name="set_notify">Notify?</string>
<string name="set_notif_silent">Silent Notifications</string>
<string name="set_night_mode">Night mode</string>
<string name="set_notif_silent">Notificacions silencioses</string>
<string name="set_night_mode">Mode nocturn</string>
<string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
<string name="settings_title_profile">Edit profile</string>
<string name="set_profile_description">Bio</string>
<string name="set_save_changes">Save changes</string>
<string name="settings_title_profile">Edita el perfil</string>
<string name="set_profile_description">Biografia...</string>
<string name="set_save_changes">Desa els canvis</string>
<string name="set_header_picture_overlay">Choose a header picture</string>
<string name="set_preview_reply">Display the number of replies in home timeline</string>
<string name="set_preview_reply_pp">Display profile pictures?</string>
@ -303,22 +303,22 @@
<string name="note_no_space">You have reached the 160 characters allowed!</string>
<string name="username_no_space">You have reached the 30 characters allowed!</string>
<string name="settings_title_hour">Time slot for notifications:</string>
<string name="settings_time_from">Between</string>
<string name="settings_time_to">and</string>
<string name="settings_time_from">Entre</string>
<string name="settings_time_to">i</string>
<string name="settings_time_greater">The time must be greater than %1$s</string>
<string name="settings_time_lower">The time must be lower than %1$s</string>
<string name="settings_hour_init">Start time</string>
<string name="settings_hour_end">End time</string>
<string name="embedded_browser">Use the built-in browser</string>
<string name="custom_tabs">Custom tabs</string>
<string name="use_javascript">Enable Javascript</string>
<string name="custom_tabs">Pestanyes personalitzades</string>
<string name="use_javascript">Habilita el Javascript</string>
<string name="expand_cw">Automatically expand cw</string>
<string name="use_cookies">Allow third-party cookies</string>
<string name="settings_ui_layout">Layout for timelines: </string>
<string-array name="settings_menu_tabs">
<item>Tabs</item>
<item>Menu</item>
<item>Tabs and menu</item>
<item>Pestanyes</item>
<item>Menú</item>
<item>Pestanyes i menú</item>
</string-array>
<string-array name="settings_translation">
<item>Yandex</item>
@ -330,29 +330,29 @@
<item>1 Mb</item>
<item>2 Mb</item>
</string-array>
<string name="set_led_colour">Set LED colour:</string>
<string name="set_led_colour">Color del LED:</string>
<string-array name="led_colours">
<item>Blue</item>
<item>Cyan</item>
<item>Blau</item>
<item>Cian</item>
<item>Magenta</item>
<item>Green</item>
<item>Red</item>
<item>Yellow</item>
<item>White</item>
<item>Verd</item>
<item>Vermell</item>
<item>Groc</item>
<item>Blanc</item>
</string-array>
<string name="set_title_news">News</string>
<string name="set_title_news">Notícies</string>
<string name="set_notification_news">Notify for new toots on the home timeline</string>
<string name="set_show_error_messages">Display error messages</string>
<string name="action_follow">Follow</string>
<string name="action_unfollow">Unfollow</string>
<string name="action_block">Block</string>
<string name="action_unblock">Unblock</string>
<string name="action_mute">Mute</string>
<string name="action_no_action">No action</string>
<string name="action_unmute">Unmute</string>
<string name="request_sent">Request sent</string>
<string name="followed_by">Follows you</string>
<string name="action_search">Search</string>
<string name="set_show_error_messages">Mostra els missatges d\'error</string>
<string name="action_follow">Segueix</string>
<string name="action_unfollow">Deixa de seguir</string>
<string name="action_block">Bloca</string>
<string name="action_unblock">Deixa de blocar</string>
<string name="action_mute">Silencia</string>
<string name="action_no_action">Cap acció</string>
<string name="action_unmute">Deixa de silenciar</string>
<string name="request_sent">S\'ha enviat la petició</string>
<string name="followed_by">Et segueix</string>
<string name="action_search">Cerca</string>
<string name="set_capitalize">First letter in capital for replies</string>
<string name="set_resize_picture">Resize pictures</string>
<!-- Quick settings for notifications -->
@ -369,10 +369,10 @@
<string name="cache_units">Mb</string>
<string name="toast_cache_clear">Cache was cleared! %1$s were released</string>
<!-- ACTIVITY CACHE -->
<string name="action_sync">Synchronize</string>
<string name="action_filter">Filter</string>
<string name="action_sync">Sincronitza</string>
<string name="action_filter">Filtre</string>
<string name="owner_cached_toots">Your toots</string>
<string name="v_public">Public</string>
<string name="v_public">Públic</string>
<string name="v_unlisted">Unlisted</string>
<string name="v_private">Private</string>
<string name="v_direct">Direct</string>
@ -384,8 +384,8 @@
<string name="data_backup_success">%1$s new toots have been imported</string>
<string-array name="filter_select">
<item>No</item>
<item>Only</item>
<item>Both</item>
<item>Només</item>
<item>Tots dos</item>
</string-array>
<string name="owner_cached_toots_empty">No toots were found in database. Please, use the synchronize button from the menu to retrieve them.</string>
<!-- PRIVACY -->
@ -396,7 +396,7 @@
Deleting the application immediately removes these data.\n
&#9888; Login and passwords are never stored. They are only used during a secure authentication (SSL) with an instance.
</string>
<string name="privacy_authorizations_title">Permissions:</string>
<string name="privacy_authorizations_title">Permisos:</string>
<string name="privacy_authorizations">
- <b>ACCESS_NETWORK_STATE</b>: Used to detect if the device is connected to a WIFI network.\n
- <b>INTERNET</b>: Used for queries to an instance.\n
@ -429,22 +429,22 @@
Thank you to Stéphane for the logo.
</string>
<string name="thanks_text_dev">
Thank you to:
Agraïments:
</string>
<string name="filter_regex">Filter out by regular expressions</string>
<string name="search">Search</string>
<string name="delete">Delete</string>
<string name="search">Cerca</string>
<string name="delete">Suprimeix</string>
<string name="fetch_more_toots">Fetch more toots…</string>
<!-- About lists -->
<string name="action_lists">Lists</string>
<string name="action_lists">Llistes</string>
<string name="action_lists_confirm_delete">Are you sure you want to permanently delete this list?</string>
<string name="action_lists_empty_content">There is nothing in this list yet. When members of this list post new statuses, they will appear here.</string>
<string name="action_lists_add_to">Add to list</string>
<string name="action_lists_remove_from">Remove from list</string>
<string name="action_lists_create">Add list</string>
<string name="action_lists_delete">Delete list</string>
<string name="action_lists_update">Edit list</string>
<string name="action_lists_title_placeholder">New list title</string>
<string name="action_lists_add_to">Afegeix a una llista</string>
<string name="action_lists_remove_from">Suprimeix de la llista</string>
<string name="action_lists_create">Afegeix una llista</string>
<string name="action_lists_delete">Suprimeix la llista</string>
<string name="action_lists_update">Edita la llista</string>
<string name="action_lists_title_placeholder">Títol de llista nou</string>
<string name="action_lists_search_users">Search among people you follow</string>
<string name="action_lists_owner">Your lists</string>
<!-- Migration -->
@ -467,11 +467,11 @@
<string name="data_export_success">%1$s toots out of %2$s have been exported.</string>
<string name="data_export_error">Something went wrong when exporting data for %1$s</string>
<!-- Proxy -->
<string name="proxy_set">Proxy</string>
<string name="proxy_type">Type</string>
<string name="proxy_enable">Enable proxy?</string>
<string name="poxy_host">Host</string>
<string name="proxy_set">Servidor intermediari</string>
<string name="proxy_type">Tipus</string>
<string name="proxy_enable">Vols habilitar el servidor intermediari?</string>
<string name="poxy_host">Servidor</string>
<string name="poxy_port">Port</string>
<string name="poxy_login">Login</string>
<string name="poxy_password">Password</string>
<string name="poxy_password">Contrasenya</string>
</resources>

View File

@ -369,25 +369,25 @@
<string name="cache_units">Mb</string>
<string name="toast_cache_clear">Cache-a garbitu da! %1$s askatu dira</string>
<!-- ACTIVITY CACHE -->
<string name="action_sync">Synchronize</string>
<string name="action_filter">Filter</string>
<string name="owner_cached_toots">Your toots</string>
<string name="v_public">Public</string>
<string name="v_unlisted">Unlisted</string>
<string name="v_private">Private</string>
<string name="v_direct">Direct</string>
<string name="v_keywords">Some keywords</string>
<string name="show_media">Show media</string>
<string name="show_pinned">Show pinned</string>
<string name="filter_no_result">No matching result found!</string>
<string name="data_backup_toots">Backup toots for %1$s</string>
<string name="data_backup_success">%1$s new toots have been imported</string>
<string name="action_sync">Sinkronizatu</string>
<string name="action_filter">Iragazi</string>
<string name="owner_cached_toots">Zure toot-ak</string>
<string name="v_public">Publikoa</string>
<string name="v_unlisted">Zerrendatu gabea</string>
<string name="v_private">Pribatua</string>
<string name="v_direct">Zuzena</string>
<string name="v_keywords">Hitz gako batzuk</string>
<string name="show_media">Erakutsi multimedia</string>
<string name="show_pinned">Erakutsi finkatuta</string>
<string name="filter_no_result">Ez da emaitzarik aurkitu!</string>
<string name="data_backup_toots">Egin %1$s kontuko toot-en babes-kopia</string>
<string name="data_backup_success">%1$s toot inportatu dira</string>
<string-array name="filter_select">
<item>No</item>
<item>Only</item>
<item>Both</item>
<item>Ez</item>
<item>Bakarrik</item>
<item>Biak</item>
</string-array>
<string name="owner_cached_toots_empty">No toots were found in database. Please, use the synchronize button from the menu to retrieve them.</string>
<string name="owner_cached_toots_empty">Ez da toot-ik aurkitu datu-basean. Erabili menuko sinkronizatu botoia eskuratzeko.</string>
<!-- PRIVACY -->
<string name="privacy_data_title">Grabatutako datuak</string>
<string name="privacy_data">

View File

@ -129,10 +129,10 @@
<plurals name="preview_replies">
<item quantity="other">%d が返信</item>
</plurals>
<string name="bookmarks">Bookmarks</string>
<string name="bookmarks_empty">No bookmarks to display</string>
<string name="status_bookmarked">Status has been added to bookmarks!</string>
<string name="status_unbookmarked">Status was removed from bookmarks!</string>
<string name="bookmarks">ブックマーク</string>
<string name="bookmarks_empty">ブックマークがありません</string>
<string name="status_bookmarked">トゥートがブックマークに追加されました!</string>
<string name="status_unbookmarked">トゥートがブックマークから削除されました!</string>
<!-- Date -->
<string name="date_seconds">%d 秒</string>
<string name="date_minutes">%d 分</string>
@ -300,7 +300,7 @@
<string name="note_no_space">160文字の制限に達しました</string>
<string name="username_no_space">30文字の制限に達しました。</string>
<string name="settings_title_hour">通知のタイムスロット:</string>
<string name="settings_time_from">時間帯:</string>
<string name="settings_time_from">期間:</string>
<string name="settings_time_to">から</string>
<string name="settings_time_greater">時間は %1$s より後でなければなりません</string>
<string name="settings_time_lower">時間は %1$s より前でなければなりません</string>
@ -365,25 +365,25 @@
<string name="cache_units">Mb</string>
<string name="toast_cache_clear">キャッシュが消去されました! %1$s が解放されました</string>
<!-- ACTIVITY CACHE -->
<string name="action_sync">Synchronize</string>
<string name="action_filter">Filter</string>
<string name="owner_cached_toots">Your toots</string>
<string name="action_sync">同期</string>
<string name="action_filter">フィルター</string>
<string name="owner_cached_toots">あなたのトゥート</string>
<string name="v_public">Public</string>
<string name="v_unlisted">Unlisted</string>
<string name="v_private">Private</string>
<string name="v_direct">Direct</string>
<string name="v_keywords">Some keywords…</string>
<string name="show_media">Show media</string>
<string name="show_pinned">Show pinned</string>
<string name="filter_no_result">No matching result found!</string>
<string name="data_backup_toots">Backup toots for %1$s</string>
<string name="data_backup_success">%1$s new toots have been imported</string>
<string name="v_direct">メンション</string>
<string name="v_keywords">キーワード...</string>
<string name="show_media">メディアを表示</string>
<string name="show_pinned">ピン留めトゥートを表示</string>
<string name="filter_no_result">一致するものは見つかりませんでした!</string>
<string name="data_backup_toots">%1$s のトゥートをバックアップ</string>
<string name="data_backup_success">%1$s 個の新しいトゥートがインポートされました</string>
<string-array name="filter_select">
<item>No</item>
<item>Only</item>
<item>Both</item>
<item>しない</item>
<item>のみ</item>
<item>する</item>
</string-array>
<string name="owner_cached_toots_empty">No toots were found in database. Please, use the synchronize button from the menu to retrieve them.</string>
<string name="owner_cached_toots_empty">トゥートがデータベースに見つかりませんでした。取得するには、メニューから同期ボタンを使用してください。</string>
<!-- PRIVACY -->
<string name="privacy_data_title">記録されたデータ</string>
<string name="privacy_data">