Skip to content

Commit 9fb30cb

Browse files
maxmemaxme
committed
Merge branch 'release/4.1' into develop
2 parents 9c51e42 + 8cae44c commit 9fb30cb

File tree

23 files changed

+504
-21
lines changed

23 files changed

+504
-21
lines changed

‎WordPress/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131

3232
defaultConfig {
3333
applicationId "org.wordpress.android"
34-
versionName "4.1-rc-3"
35-
versionCode 184
34+
versionName "4.1"
35+
versionCode 185
3636
minSdkVersion 14
3737
targetSdkVersion 21
3838

‎WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ public static void addMedia(Activity activity) {
139139
WordPressMediaUtils.launchPictureLibrary(activity);
140140
}
141141

142-
public static void viewAccountSettings(Context context) {
143-
Intent intent = new Intent(context, SettingsActivity.class);
144-
slideInFromRight(context, intent);
142+
public static void viewAccountSettings(Activity activity) {
143+
Intent intent = new Intent(activity, SettingsActivity.class);
144+
slideInFromRightForResult(activity, intent, RequestCodes.ACCOUNT_SETTINGS);
145145
}
146146

147147
public static void viewHelpAndSupport(Context context, Tag origin) {

‎WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
* Global intent identifiers
55
*/
66
public class RequestCodes {
7-
public static final int ADD_ACCOUNT = 100;
8-
public static final int REAUTHENTICATE = 200;
9-
public static final int SETTINGS = 300;
10-
public static final int READER_SUBS = 400;
11-
public static final int READER_REBLOG = 500;
12-
public static final int NOTE_DETAIL = 600;
13-
public static final int SITE_PICKER = 700;
14-
public static final int EDIT_POST = 800;
15-
public static final int CREATE_BLOG = 900;
16-
public static final int BLOG_SETTINGS = 1000;
7+
public static final int ADD_ACCOUNT = 100;
8+
public static final int REAUTHENTICATE = 200;
9+
public static final int ACCOUNT_SETTINGS = 300;
10+
public static final int READER_SUBS = 400;
11+
public static final int READER_REBLOG = 500;
12+
public static final int NOTE_DETAIL = 600;
13+
public static final int SITE_PICKER = 700;
14+
public static final int EDIT_POST = 800;
15+
public static final int CREATE_BLOG = 900;
16+
public static final int BLOG_SETTINGS = 1000;
1717

1818
// Media
1919
public static final int PICTURE_LIBRARY = 2000;

‎WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.wordpress.android.ui.notifications.utils.SimperiumUtils;
3232
import org.wordpress.android.ui.prefs.AppPrefs;
3333
import org.wordpress.android.ui.prefs.BlogPreferencesActivity;
34+
import org.wordpress.android.ui.prefs.SettingsFragment;
3435
import org.wordpress.android.ui.reader.ReaderEvents;
3536
import org.wordpress.android.ui.reader.ReaderPostListFragment;
3637
import org.wordpress.android.util.AppLog;
@@ -356,6 +357,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
356357
}
357358
}
358359
break;
360+
case RequestCodes.ACCOUNT_SETTINGS:
361+
if (resultCode == SettingsFragment.LANGUAGE_CHANGED) {
362+
resetFragments();
363+
}
364+
break;
359365
}
360366
}
361367

‎WordPress/src/main/java/org/wordpress/android/ui/prefs/SettingsFragment.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
@SuppressWarnings("deprecation")
5353
public class SettingsFragment extends PreferenceFragment {
5454
public static final String SETTINGS_PREFERENCES = "settings-pref";
55+
public static final int LANGUAGE_CHANGED = 1000;
5556

5657
private AlertDialog mDialog;
5758
private SharedPreferences mSettings;
@@ -284,6 +285,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
284285
// Refresh the app
285286
Intent refresh = new Intent(getActivity(), getActivity().getClass());
286287
startActivity(refresh);
288+
getActivity().setResult(LANGUAGE_CHANGED);
287289
getActivity().finish();
288290
}
289291
});

‎WordPress/src/main/res/values-ar/strings.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<string name="me_disconnect_from_wordpress_com">قطع الاتصال بموقع وردبرس.كوم</string>
4+
<string name="me_btn_login_logout">تسجيل الدخول/تسجيل الخروج</string>
5+
<string name="me_connect_to_wordpress_com">الاتصال بموقع وردبرس.كوم</string>
6+
<string name="me_btn_support">المساعدة والدعم</string>
7+
<string name="site_picker_cant_hide_current_site">"%s" لم يكن مخفيًا لأنه الموقع الحالي</string>
8+
<string name="me_btn_settings">إعدادات الحساب</string>
9+
<string name="site_picker_create_dotcom">إنشاء موقع وردبرس.كوم</string>
10+
<string name="site_picker_add_site">إضافة موقع</string>
11+
<string name="site_picker_edit_visibility">إظهار/إخفاء المواقع</string>
12+
<string name="site_picker_add_self_hosted">إضافة موقع مستضاف ذاتيًا</string>
13+
<string name="my_site_btn_view_site">عرض الموقع</string>
14+
<string name="site_picker_title">إختر الموقع</string>
15+
<string name="my_site_btn_view_admin">عرض المسؤول</string>
16+
<string name="my_site_btn_switch_site">تبديل الموقع</string>
17+
<string name="my_site_header_publish">نشر</string>
18+
<string name="my_site_btn_blog_posts">مقالات المدونة</string>
19+
<string name="my_site_btn_comments">التعليقات</string>
20+
<string name="my_site_header_look_and_feel">الشكل والطابع</string>
21+
<string name="my_site_btn_site_settings">الإعدادات</string>
22+
<string name="my_site_header_configuration">التكوين</string>
23+
<string name="reader_label_new_posts_subtitle">انقر لعرضها</string>
24+
<string name="my_site_header_admin">المسؤول</string>
25+
<string name="notifications_account_required">تسجيل الدخول إلى موقع وردبرس.كوم للحصول على التنبيهات</string>
26+
<string name="stats_unknown_author">كاتب غير معروف</string>
27+
<string name="image_added">تمت إضافة صورة</string>
28+
<string name="signout">قطع الاتصال</string>
29+
<string name="select_all">اختيار الكل</string>
30+
<string name="sign_out_wpcom_confirm">سيؤدي قطع اتصال حسابك إلى إزالة كل بيانات وردبرس.كوم الخاصة بـ %s@ من هذا الجهاز، بما في ذلك المسودات المحلية والتغييرات المحلية.</string>
31+
<string name="show">إظهار</string>
32+
<string name="hide">إخفاء</string>
33+
<string name="deselect_all">إلغاء تحديد الكل</string>
334
<string name="select_from_new_picker">تحديد متعدد بأداة الانتقاء الجديدة</string>
435
<string name="no_media_sources">تعذر إحضار الوسائط</string>
536
<string name="loading_blog_images">جارٍ إحضار الصور</string>
@@ -130,6 +161,7 @@
130161
<string name="stats_for">إحصاءات %s</string>
131162
<string name="themes_fetching">جارٍ إحضار القوالب…</string>
132163
<string name="ssl_certificate_details">تفاصيل</string>
164+
<string name="sure_to_remove_account">هل ترغب في إزالة هذا الموقع؟</string>
133165
<string name="delete_sure_post">حذف هذه المقالة</string>
134166
<string name="delete_sure">حذف هذه المسودة</string>
135167
<string name="delete_sure_page">حذف هذه الصفحة</string>
@@ -228,6 +260,7 @@
228260
<string name="forums">المنتديات</string>
229261
<string name="ssl_certificate_error">شهادة SSL غير صالحة</string>
230262
<string name="ssl_certificate_ask_trust">إذا كنت عادة تتصل بهذا الموقع بدون أي مشاكل، فربما يعني هذا الخطأ أن شخصًا ما يحاول سرقة هذا الموقع, وينبغي ألا تقوم بالاستمرار. هل ترغب في الوثوق بالشهادة على أي حال؟</string>
263+
<string name="could_not_remove_account">تعذر إزالة الموقع</string>
231264
<string name="no_site_error">غير قادر على الاتصال بموقع الووردبريس</string>
232265
<string name="no_account">لم يتم العثور على حساب ووردبريس، أضف حسابًا وحاول من جديد</string>
233266
<string name="error_generic">حدث خطأ</string>
@@ -293,6 +326,8 @@
293326
<string name="blog_name_only_lowercase_letters_and_numbers">عنوان الموقع يمكنه أن يحتوي فقط على حروف صغيرة (a-z) وأرقام</string>
294327
<string name="blog_name_reserved_but_may_be_available">هذا الموقع محجوز حاليًا وممكن أن يكون متوفرًا خلال بضعة أيام</string>
295328
<string name="mnu_comment_unspam">ليس بريدًا مزعجًا</string>
329+
<string name="blog_removed_successfully">تمت إزالة الموقع بنجاح</string>
330+
<string name="remove_account">إزالة الموقع</string>
296331
<string name="connection_error">خطأ في الاتصال</string>
297332
<string name="theme_current_theme">القالب الحالي</string>
298333
<string name="media_gallery_num_columns">عدد الاعمدة</string>

‎WordPress/src/main/res/values-de/strings.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<string name="me_disconnect_from_wordpress_com">Verbindung zu WordPress.com trennen</string>
4+
<string name="me_btn_login_logout">Anmelden/ Abmelden</string>
5+
<string name="me_connect_to_wordpress_com">Mit WordPress.com verbinden</string>
6+
<string name="site_picker_cant_hide_current_site">"%s" wurde nicht ausgeblendet, denn es ist die aktuelle Webseite</string>
7+
<string name="me_btn_settings">Kontoeinstellungen</string>
8+
<string name="me_btn_support">Hilfe &amp; Support</string>
9+
<string name="site_picker_create_dotcom">WordPress.com Webseite erstellen</string>
10+
<string name="site_picker_edit_visibility">Webseiten anzeigen/ ausblenden</string>
11+
<string name="site_picker_add_self_hosted">Selbstgehostete Webseite hinzufügen</string>
12+
<string name="site_picker_add_site">Webseite hinzufügen</string>
13+
<string name="my_site_btn_switch_site">Webseite wechseln</string>
14+
<string name="my_site_btn_view_site">Webseite ansehen</string>
15+
<string name="site_picker_title">Webseite auswählen</string>
16+
<string name="my_site_btn_view_admin">Admin aufrufen</string>
17+
<string name="my_site_header_publish">Veröffentlichen</string>
18+
<string name="my_site_header_look_and_feel">Erscheinungsbild</string>
19+
<string name="my_site_btn_blog_posts">Blogbeiträge</string>
20+
<string name="my_site_btn_site_settings">Einstellungen</string>
21+
<string name="my_site_btn_comments">Kommentare</string>
22+
<string name="my_site_header_admin">Admin</string>
23+
<string name="reader_label_new_posts_subtitle">Berühren zum Anzeigen</string>
24+
<string name="my_site_header_configuration">Einrichtung</string>
25+
<string name="notifications_account_required">Für Benachrichtigungen bei WordPress.com anmelden</string>
26+
<string name="stats_unknown_author">Unbekannter Autor</string>
27+
<string name="image_added">Bild hinzugefügt</string>
28+
<string name="signout">Trennen</string>
29+
<string name="deselect_all">Alle abwählen</string>
30+
<string name="show">Anzeigen</string>
31+
<string name="hide">Ausblenden</string>
32+
<string name="select_all">Alle auswählen</string>
33+
<string name="sign_out_wpcom_confirm">Das Trennen deines Benutzerkontos wird alle WordPress.com Daten von @%s von diesem Gerät entfernen, einschließlich aller lokal gespeicherten Entwürfe und Änderungen.</string>
334
<string name="select_from_new_picker">Mehrfach-Auswahl mit dem neuen Auswahlwerkzeug</string>
435
<string name="no_media_sources">Konnte Medien nicht abrufen</string>
536
<string name="loading_blog_images">Rufe Bilder ab</string>
@@ -130,6 +161,7 @@
130161
<string name="stats_for">Statistiken für %s</string>
131162
<string name="themes_fetching">Themes werden abgerufen…</string>
132163
<string name="ssl_certificate_details">Details</string>
164+
<string name="sure_to_remove_account">Diese Website entfernen?</string>
133165
<string name="cab_selected">%d ausgewählt</string>
134166
<string name="confirm_delete_media">Ausgewähltes Objekt löschen?</string>
135167
<string name="confirm_delete_multi_media">Ausgewählte Objekte löschen?</string>
@@ -293,6 +325,7 @@
293325
<string name="blog_name_required">Gib eine Webseiten-Adresse ein</string>
294326
<string name="blog_name_not_allowed">Diese Webseiten-Adresse ist nicht erlaubt</string>
295327
<string name="blog_name_contains_invalid_characters">Webseiten-Adresse darf das Zeichen "_" nicht enthalten</string>
328+
<string name="could_not_remove_account">Website konnte nicht entfernt werden</string>
296329
<string name="edit_post">Beitrag bearbeiten</string>
297330
<string name="add_comment">Kommentar hinzufügen</string>
298331
<string name="connection_error">Fehler beim Verbinden</string>
@@ -397,6 +430,8 @@
397430
<string name="category_slug">Kategorie-Titelform (optional)</string>
398431
<string name="pending_review">Ausstehender Review</string>
399432
<string name="author_name">Autor-Name</string>
433+
<string name="blog_removed_successfully">Website erfolgreich entfernt</string>
434+
<string name="remove_account">Website entfernen</string>
400435
<string name="deleting_page">Lösche Seite</string>
401436
<string name="share_url_post">Beitrag teilen</string>
402437
<string name="share_link">Link teilen</string>

‎WordPress/src/main/res/values-el/strings.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<string name="media_details_file_type">Τύπος αρχείου:</string>
4+
<string name="media_details_file_name">Όνομα αρχείου:</string>
5+
<string name="media_details_file_url">URL αρχείου:</string>
6+
<string name="media_details_dimensions">Διαστάσεις:</string>
7+
<string name="device">Συσκευή</string>
8+
<string name="language">Γλώσσα</string>
9+
<string name="pages_fetching">Ανάκτηση σελίδων...</string>
310
<string name="comments_fetching">Ανάκτηση σχολίων...</string>
4-
<string name="pages_fetching">Ανάκτηση σελίλδων...</string>
511
<string name="toast_err_post_uploading">Αδύνατο το άνοιγμα το άρθρου όσο αυτό φορτώνει</string>
612
<string name="stats_view_search_terms">Όροι αναζήτησης</string>
713
<string name="stats_empty_search_terms">Δεν καταχωρήθηκαν όροι αναζήτησης</string>
@@ -14,26 +20,42 @@
1420
<string name="stats_empty_search_terms_desc">Μάθετε περισσότερα για την κίνηση στην αναζήτηση σας εξετάζοντας τους όρους αναζήτησης που χρησιμοποίησαν οι χρήστες για να βρούν το site σας.</string>
1521
<string name="reader_empty_posts_request_failed">Αδυναμία φόρτωσης των άρθρων</string>
1622
<string name="publisher">Εκδότης:</string>
23+
<string name="delete_sure_page">Διαγραφή της σελίδας</string>
24+
<string name="confirm_delete_multi_media">Διαγραφή επιλεγμένων αντικειμένων;</string>
25+
<string name="confirm_delete_media">Διαγραφή επιλεγμένου αντικειμένου;</string>
26+
<string name="cab_selected">%d επιλεγμένα</string>
27+
<string name="reader_label_comment_count_multi">%,d σχόλια</string>
28+
<string name="reader_title_photo_viewer">%1$d από %2$d</string>
29+
<string name="older_two_days">Παλιότερο από 2 μέρες</string>
30+
<string name="older_last_week">Παλιότερο από 1 βδομάδα</string>
31+
<string name="comment">Σχόλιο</string>
32+
<string name="reader_likes_multi_short">%,d άτομα</string>
33+
<string name="reader_title_comments">Σχόλια</string>
1734
<string name="contact_us">Επικοινωνήστε μαζί μας</string>
1835
<string name="hs__username_blank_error">Συμπληρώστε ένα έγκυρο όνομα</string>
1936
<string name="hs__invalid_email_error">Εισάγετε μία έγκυρη διεύθυνση email</string>
2037
<string name="hs__conversation_detail_error">Περιγράψτε το πρόβλημα που βλέπετε</string>
2138
<string name="add_location">Προσθέστε περιοχή</string>
2239
<string name="current_location">Τωρινή τοποθεσία</string>
40+
<string name="your_signature">Η υπογραφή σας:</string>
2341
<string name="search_location">Αναζήτηση</string>
2442
<string name="edit_location">Επεξεργασία</string>
2543
<string name="preference_privacy">Ιδιωτικότητα </string>
2644
<string name="preference_send_usage_stats">Αποστολή στατιστικών</string>
2745
<string name="preference_send_usage_stats_summary">Αυτόματη αποστολή στατιστικών στοιχείων χρήσης ώστε να μας βοηθήσετε να βελτιώσουμε το WordPress για το Android</string>
2846
<string name="reader_hint_reblog_comment">Προσθέστε τις σκέψεις σας (προαιρετικό)</string>
2947
<string name="reader_title_blog_preview">Προεπισκόπηση Ιστολογίου</string>
48+
<string name="saving">Αποθήκευση...</string>
3049
<string name="help_center">Κέντρο βοήθειας</string>
3150
<string name="help">Βοήθεια</string>
3251
<string name="forgot_password">Έχασες τον κωδικό σου;</string>
3352
<string name="ssl_certificate_error">Μη έγκυρο πιστοποιητικό SSL</string>
3453
<string name="forums">Συζητήσεις</string>
3554
<string name="out_of_memory">Η μνήμη της συσκευής εξαντλήθηκε</string>
3655
<string name="no_network_message">Δεν υπάρχει διαθέσιμο δίκτυο</string>
56+
<string name="comments_empty_list">Δεν υπάρχουν σχόλια</string>
57+
<string name="stats_empty_comments">Δεν υπάρχουν σχόλια ακόμη</string>
58+
<string name="theme_no_search_result_found">Δεν βρέθηκαν αποτελέσματα</string>
3759
<string name="learn_more">Μάθετε περισσότερα</string>
3860
<string name="category_name">Όνομα κατηγορίας</string>
3961
<string name="preview_page">Προεπισκόπιση σελίδας</string>

‎WordPress/src/main/res/values-en-rGB/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="ssl_certificate_details">Details</string>
4+
<string name="sure_to_remove_account">Remove this site?</string>
45
<string name="delete_sure_post">Delete this post</string>
56
<string name="delete_sure">Delete this draft</string>
67
<string name="delete_sure_page">Delete this page</string>
@@ -164,6 +165,7 @@
164165
<string name="username_or_password_incorrect">The username or password you entered is incorrect</string>
165166
<string name="nux_cannot_log_in">We can\'t log you in</string>
166167
<string name="out_of_memory">Device out of memory</string>
168+
<string name="could_not_remove_account">Couldn\'t remove site</string>
167169
<string name="xmlrpc_error">Couldn\'t connect. Enter the full path to xmlrpc.php on your site and try again.</string>
168170
<string name="select_categories">Select categories</string>
169171
<string name="account_details">Account details</string>
@@ -268,6 +270,8 @@
268270
<string name="blog_name_must_include_letters">Site address must have at least 1 letter (a-z)</string>
269271
<string name="blog_name_invalid">Invalid site address</string>
270272
<string name="blog_title_invalid">Invalid site title</string>
273+
<string name="blog_removed_successfully">Site removed successfully</string>
274+
<string name="remove_account">Remove site</string>
271275
<string name="deleting_page">Deleting page</string>
272276
<string name="deleting_post">Deleting post</string>
273277
<string name="share_url_post">Share post</string>

0 commit comments

Comments
 (0)