Fix merge conflicts

Author: loremattei

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+12.8
+-----
+
+
 12.7
 -----
 * Show upload in progress notification when retrying
@@ -73,3 +77,4 @@
 * Updated Notifications with tabs
 * Add Posting activity block to the Stats/Insights
 * Fixed error notifications for failed uploads
+

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

@@ -30,7 +30,6 @@ Language: ar
     <string name="domain_contact_information_title">معلومات الاتصال الخاصة بالنطاق</string>
     <string name="domain_privacy_option_off_title">التسجيل بشكل علني</string>
     <string name="domain_privacy_option_on_title">التسجيل بشكل خاص مع ميزة الحماية من الخصوصية</string>
-    <string name="domain_registration_privacy_protection_tos">من خلال تسجيل هذا النطاق، فإنك توافق على</string>
     <string name="domain_registration_privacy_protection_description">يتعين على مالكي النطاق مشاركة معلومات الاتصال في قاعدة بيانات عامة لجميع النطاقات.\n        مع ميزة حماية الخصوصية، ننشر معلوماتنا الخاصة بدلاً من معلوماتك، وإعادة توجيه أي اتصال إليك بشكل سري.</string>
     <string name="domain_registration_privacy_protection_title">حماية الخصوصية</string>
     <string name="domain_registration_contact_form_input_error">الرجاء إدخال عنوان %s صالح</string>

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

@@ -30,7 +30,6 @@ Language: de
     <string name="domain_contact_information_title">Domain-Kontaktdaten</string>
     <string name="domain_privacy_option_off_title">Öffentlich registrieren</string>
     <string name="domain_privacy_option_on_title">Privat mit Datenschutz registrieren</string>
-    <string name="domain_registration_privacy_protection_tos">Wenn du diese Domain registrierst, stimmst du Folgendem zu: </string>
     <string name="domain_registration_privacy_protection_description">Domain-Eigentümer müssen ihre Kontaktinformationen in einer öffentlichen Datenbank aller Domains veröffentlichen.\n Durch den Datenschutz veröffentlichen wir unsere eigenen Informationen anstatt deinen und leiten sämtliche Kommunikation vertraulich an dich weiter.</string>
     <string name="domain_registration_privacy_protection_title">Datenschutz</string>
     <string name="domain_registration_contact_form_input_error">Bitte gib eine gültige %s ein</string>

WordPress/src/main/res/values-en-rAU/strings.xml

@@ -30,7 +30,6 @@ Language: en_AU
     <string name="domain_contact_information_title">Domain contact information</string>
     <string name="domain_privacy_option_off_title">Register publicly</string>
     <string name="domain_privacy_option_on_title">Register privately with Privacy Protection</string>
-    <string name="domain_registration_privacy_protection_tos">By registering this domain you agree to our </string>
     <string name="domain_registration_privacy_protection_description">Domain owners have to share contact information in a public database of all domains.\n        With Privacy Protection, we publish our own information instead of yours and privately forward any communication to you.</string>
     <string name="domain_registration_privacy_protection_title">Privacy Protection</string>
     <string name="domain_registration_contact_form_input_error">Please enter a valid %s</string>

WordPress/src/main/res/values-en-rCA/strings.xml

@@ -30,7 +30,6 @@ Language: en_CA
     <string name="domain_contact_information_title">Domain contact information</string>
     <string name="domain_privacy_option_off_title">Register publicly</string>
     <string name="domain_privacy_option_on_title">Register privately with Privacy Protection</string>
-    <string name="domain_registration_privacy_protection_tos">By registering this domain you agree to our </string>
     <string name="domain_registration_privacy_protection_description">Domain owners have to share contact information in a public database of all domains.\n        With Privacy Protection, we publish our own information instead of yours and privately forward any communication to you.</string>
     <string name="domain_registration_privacy_protection_title">Privacy Protection</string>
     <string name="domain_registration_contact_form_input_error">Please enter a valid %s</string>

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

@@ -30,7 +30,6 @@ Language: en_GB
     <string name="domain_contact_information_title">Domain contact information</string>
     <string name="domain_privacy_option_off_title">Register publicly</string>
     <string name="domain_privacy_option_on_title">Register privately with Privacy Protection</string>
-    <string name="domain_registration_privacy_protection_tos">By registering this domain you agree to our </string>
     <string name="domain_registration_privacy_protection_description">Domain owners have to share contact information in a public database of all domains.\n        With Privacy Protection, we publish our own information instead of yours and privately forward any communication to you.</string>
     <string name="domain_registration_privacy_protection_title">Privacy Protection</string>
     <string name="domain_registration_contact_form_input_error">Please enter a valid %s</string>

WordPress/src/main/res/values-es/strings.xml

@@ -30,7 +30,6 @@ Language: es
     <string name="domain_contact_information_title">Información de contacto del dominio</string>
     <string name="domain_privacy_option_off_title">Registrar públicamente</string>
     <string name="domain_privacy_option_on_title">Registrar privadamente con protección de privacidad</string>
-    <string name="domain_registration_privacy_protection_tos">Al registrar este dominio aceptas nuestra</string>
     <string name="domain_registration_privacy_protection_description">Lo propietarios de dominios tienen que compartir información en una base de datos pública de todos los dominios.\n   Con la protección de privacidad publicamos nuestra propia información en vez de la tuya, y te redirigiremos de forma privada cualquier comunicación dirigida a ti. </string>
     <string name="domain_registration_privacy_protection_title">Protección de privacidad</string>
     <string name="domain_registration_contact_form_input_error">Por favor, introduce un %s válido</string>

WordPress/src/main/res/values-fr/strings.xml

@@ -30,7 +30,6 @@ Language: fr
     <string name="domain_contact_information_title">Coordonnées du domaine</string>
     <string name="domain_privacy_option_off_title">S\'inscrire publiquement</string>
     <string name="domain_privacy_option_on_title">S\'inscrire en privé avec protection de la vie privée</string>
-    <string name="domain_registration_privacy_protection_tos">En enregistrant ce domaine, vous acceptez nos </string>
     <string name="domain_registration_privacy_protection_description">Les propriétaires de domaines sont tenus de partager leurs informations de contact dans une base de données publique de domaines.\n Grâce à la fonction de protection de la vie privée, nous publions nos propres informations à la place des vôtres et vous transmettons les communications en privé.</string>
     <string name="domain_registration_privacy_protection_title">Protection de la vie privée</string>
     <string name="domain_registration_contact_form_input_error">Veuillez saisir un(e) %s valide</string>

WordPress/src/main/res/values-he/strings.xml

@@ -30,7 +30,6 @@ Language: he_IL
     <string name="domain_contact_information_title">פרטי יצירת קשר עם הדומיין</string>
     <string name="domain_privacy_option_off_title">רישום ציבורי</string>
     <string name="domain_privacy_option_on_title">הירשמות באופן פרטי עם הגנת פרטיות</string>
-    <string name="domain_registration_privacy_protection_tos">רישום לדומיין מהווה אישור מצדך של </string>
     <string name="domain_registration_privacy_protection_description">בעלי דומיינים מחויבים לשתף את פרטי הקשר שלהם בבסיס נתונים ציבורי של כל הדומיינים.\n בזכות הגנת פרטיות, אנחנו מפרסמים את הפרטים שלנו ולא את שלך ומעבירים אליך באופן פרטי כל התקשרות שתהיה.</string>
     <string name="domain_registration_privacy_protection_title">הגנת פרטיות</string>
     <string name="domain_registration_contact_form_input_error">יש להזין נתונים תקפים עבור %s</string>

WordPress/src/main/res/values-id/strings.xml

@@ -30,7 +30,6 @@ Language: id
     <string name="domain_contact_information_title">Informasi kontak domain</string>
     <string name="domain_privacy_option_off_title">Daftarkan secara publik</string>
     <string name="domain_privacy_option_on_title">Daftarkan secara pribadi dengan Perlindungan Privasi</string>
-    <string name="domain_registration_privacy_protection_tos">Dengan mendaftarkan domain ini, Anda menyetujui </string>
     <string name="domain_registration_privacy_protection_description">Pemilik domain harus berbagi informasi kontak di database publik semua domain.\n Dengan Perlindungan Privasi, kami memublikasikan informasi kami sendiri, bukan informasi Anda, dan meneruskan segala komunikasi kepada Anda secara pribadi.</string>
     <string name="domain_registration_privacy_protection_title">Perlindungan Privasi</string>
     <string name="domain_registration_contact_form_input_error">Masukkan %s yang valid</string>