Resolve Conflicts

EvilInsultGenerator · Jul 22, 2022 · ec56074 · ec56074
1 parent 03e8555
commit ec56074
Show file tree

Hide file tree

Showing 257 changed files with 1,400 additions and 350 deletions.
diff --git a/fastlane/metadata/android/af-ZA/full_description.txt b/fastlane/metadata/android/af-ZA/full_description.txt
@@ -0,0 +1,28 @@
+Why should you download the Evil Insult Generator, as opposed to another insult app?
+
+<b>Simplicity</b>
+The interface is user-friendly, and the insults are all of high quality. The app was developed to provide you with a pleasurable experience.
+On the app's main screen, you'll have the ability to generate and browse various evil insults. Using the app couldn't be easier, and it only takes a second to generate new insults. You can browse through them with a simple tap of your screen.
+
+<b>Free & Open Source</b>
+This app is completely free to use and will stay that way forever. The source code is available on GitHub. You do not have to worry about special memberships, annual subscriptions, or hidden costs to generate results and share them with others.
+
+<b>Sharing</b>
+We endeavored to simplify the process of using this app. You will be able to share insults produced by the Evil Insult Generator at no charge. Your insults can be shared with friends on various apps. 
+
+<b>Updated Regularly</b>
+The development team that created this app are always adding new insults to it. Each insult is easy to share, and others can use them, if desired. 
+But we need your support. Please send us your insults and we will review it. If we like it, the insult will be the newest addition to the app. 
+
+<b>A Huge Collection of Insults</b>
+This app does not have any shortage of insults that you can use. Many of them have a uniqueness that can’t be found anywhere else.
+Don't delay – download the evil insults app and come up with creative lines that you can use on just about anybody!
+We endeavor to optimize user experiences for everyone. Feedback is something we welcome. If you have a recommendation or suggestion, we would like to hear them. Don't hesitate to get in touch with us at [email protected]. In doing so, we will be able to optimize your experience and keep the app updated with cutting-edge insults.
+
+<b>ℹ️ Note ℹ️</b>
+- The source can be found here: https://github.com/EvilInsultGenerator/android-app/
+- Your assistance with app translation is very much appreciated: https://crowdin.com/project/evil-insult-generator-android/
+- Feel very welcome to send me your favorite insults so that I can add them
+
+<b>⚠️ Warning ⚠️</b>
+Many insults that are generated by the app will offend some people, and as such, you should be careful with whom you use these insults on. This app is for mature users only.
diff --git a/fastlane/metadata/android/af-ZA/short_description.txt b/fastlane/metadata/android/af-ZA/short_description.txt
@@ -0,0 +1 @@
+This is the greatest insults app you can get!
diff --git a/fastlane/metadata/android/af-ZA/title.txt b/fastlane/metadata/android/af-ZA/title.txt
@@ -0,0 +1 @@
+Evil Insult Generator
diff --git a/fastlane/metadata/android/af-ZA/video.txt b/fastlane/metadata/android/af-ZA/video.txt
@@ -0,0 +1 @@
+https://youtu.be/6UONhJ6lKL8
diff --git a/fastlane/metadata/android/ar-SA/full_description.txt b/fastlane/metadata/android/ar-SA/full_description.txt
@@ -1,6 +1,5 @@
 لماذا يجب عليك تنزيل Evil Insult Generator ، بدلاً من تطبيق إهانة آخر؟
 
-<<<<<<< HEAD
 <b>البساطة</b>
 الواجهة سهلة الاستخدام ، والرسومات كلها عالية الجودة. تم تطوير التطبيق ليوفر لك تجربة ممتعة.
 على شاشة التطبيقات ' الرئيسية ، ' لديك القدرة على توليد وتصفح الإهانات الشريرة المختلفة. لا يمكن أن يكون استخدام التطبيق أسهل ' ، ولا يستغرق الأمر أكثر من ثانية لتوليد إهانات جديدة. يمكنك تصفحها بنقرة بسيطة على شاشتك.
@@ -16,34 +15,13 @@
 لكننا نحتاج إلى دعمكم. من فضلك أرسل لنا إهاناتك وسنراجعها. إذا أحببنا ذلك ، فستكون الإهانة هي أحدث إضافة للتطبيق. 
 
 </b>مجموعة ضخمة من الإهانات<b>
-=======
-<b>Simplicity</b>
-الواجهة سهلة الاستخدام ، والرسومات كلها عالية الجودة. تم تطوير التطبيق ليوفر لك تجربة ممتعة.
-على شاشة التطبيقات ' الرئيسية ، ' لديك القدرة على توليد وتصفح الإهانات الشريرة المختلفة. لا يمكن أن يكون استخدام التطبيق أسهل ' ، ولا يستغرق الأمر أكثر من ثانية لتوليد إهانات جديدة. يمكنك تصفحها بنقرة بسيطة على شاشتك.
-
-مجاني & مفتوح المصدر
-هذا التطبيق مجاني تمامًا للاستخدام وسيظل هكذا إلى الأبد. كود المصدر متاح على جيثب. لا داعي للقلق بشأن العضويات الخاصة أو الاشتراكات السنوية أو التكاليف المخفية لتوليد النتائج ومشاركتها مع الآخرين.
-
-<b>Sharing</b>
-- مساعدتك في ترجمة التطبيق محل تقدير كبير: https://crowdin.com/project/evil-insult-generator-android/ يمكن مشاركة إهاناتك مع الأصدقاء على تطبيقات مختلفة. 
-
-<b>Updated Regularly</b>
-يقوم فريق التطوير الذي أنشأ هذا التطبيق دائمًا بإضافة إهانات جديدة إليه. من السهل مشاركة كل إهانة ، ويمكن للآخرين استخدامها إذا رغبوا في ذلك. 
-لكننا نحتاج إلى دعمكم. من فضلك أرسل لنا إهاناتك وسنراجعها. إذا أحببنا ذلك ، فستكون الإهانة هي أحدث إضافة للتطبيق. 
-
-مجموعة ضخمة من الإهانات
->>>>>>> origin/master
 لا يحتوي هذا التطبيق على أي نقص في الإهانات التي يمكنك استخدامها. كثير منهم لديهم تفرد لا يمكن العثور عليه في أي مكان آخر.
 لا تتأخر ' - قم بتنزيل تطبيق الإهانات الشريرة وتوصل إلى خطوط إبداعية يمكنك استخدامها مع أي شخص تقريبًا!
 نحن نسعى إلى تحسين تجارب المستخدم للجميع. التعليقات هي شيء نرحب به. إذا كانت لديك توصية أو اقتراح ، فنحن نود أن نسمعها. لا ' تتردد في الاتصال بنا على [email protected]. من خلال القيام بذلك ، سنكون قادرين على تحسين تجربتك والحفاظ على التطبيق محدثًا بإهانات متطورة.
 
 ℹ️ ملاحظة ℹ️
 - يمكن العثور على المصدر هنا: https://github.com/EvilInsultGenerator/android-app/
-<<<<<<< HEAD
 - مساعدتك في ترجمة التطبيق موضع تقدير كبير: https://crowdin.com/project/evil-insult-generator-android/
-=======
-- Your assistance with app translation is very much appreciated: https://crowdin.com/project/evil-insult-generator-android/
->>>>>>> origin/master
 - لا تتردد في إرسال الإهانات المفضلة إلي حتى يمكنني إضافتها
 
 ⚠️ تحذير ⚠️

diff --git a/fastlane/metadata/android/ar-SA/short_description.txt b/fastlane/metadata/android/ar-SA/short_description.txt
@@ -0,0 +1 @@
+هذا هو أعظم تطبيق إهانات يمكنك الحصول عليه!
diff --git a/fastlane/metadata/android/ar-SA/title.txt b/fastlane/metadata/android/ar-SA/title.txt
@@ -0,0 +1 @@
+مولد الإهانة الشريرة
diff --git a/fastlane/metadata/android/ar-SA/video.txt b/fastlane/metadata/android/ar-SA/video.txt
@@ -0,0 +1 @@
+https://youtu.be/6UONhJ6lKL8
diff --git a/fastlane/metadata/android/bg-BG/full_description.txt b/fastlane/metadata/android/bg-BG/full_description.txt
@@ -0,0 +1,28 @@
+Why should you download the Evil Insult Generator, as opposed to another insult app?
+
+<b>Simplicity</b>
+The interface is user-friendly, and the insults are all of high quality. The app was developed to provide you with a pleasurable experience.
+On the app's main screen, you'll have the ability to generate and browse various evil insults. Using the app couldn't be easier, and it only takes a second to generate new insults. You can browse through them with a simple tap of your screen.
+
+<b>Free & Open Source</b>
+This app is completely free to use and will stay that way forever. The source code is available on GitHub. You do not have to worry about special memberships, annual subscriptions, or hidden costs to generate results and share them with others.
+
+<b>Sharing</b>
+We endeavored to simplify the process of using this app. You will be able to share insults produced by the Evil Insult Generator at no charge. Your insults can be shared with friends on various apps. 
+
+<b>Updated Regularly</b>
+The development team that created this app are always adding new insults to it. Each insult is easy to share, and others can use them, if desired. 
+But we need your support. Please send us your insults and we will review it. If we like it, the insult will be the newest addition to the app. 
+
+<b>A Huge Collection of Insults</b>
+This app does not have any shortage of insults that you can use. Many of them have a uniqueness that can’t be found anywhere else.
+Don't delay – download the evil insults app and come up with creative lines that you can use on just about anybody!
+We endeavor to optimize user experiences for everyone. Feedback is something we welcome. If you have a recommendation or suggestion, we would like to hear them. Don't hesitate to get in touch with us at [email protected]. In doing so, we will be able to optimize your experience and keep the app updated with cutting-edge insults.
+
+<b>ℹ️ Note ℹ️</b>
+- The source can be found here: https://github.com/EvilInsultGenerator/android-app/
+- Your assistance with app translation is very much appreciated: https://crowdin.com/project/evil-insult-generator-android/
+- Feel very welcome to send me your favorite insults so that I can add them
+
+<b>⚠️ Warning ⚠️</b>
+Many insults that are generated by the app will offend some people, and as such, you should be careful with whom you use these insults on. This app is for mature users only.
diff --git a/fastlane/metadata/android/bg-BG/short_description.txt b/fastlane/metadata/android/bg-BG/short_description.txt
@@ -0,0 +1 @@
+This is the greatest insults app you can get!
diff --git a/fastlane/metadata/android/bg-BG/short_desription.txt b/fastlane/metadata/android/bg-BG/short_desription.txt
@@ -0,0 +1 @@
+Това е най-доброто приложение за обиди, което можете да свалите!
diff --git a/fastlane/metadata/android/bg-BG/title.txt b/fastlane/metadata/android/bg-BG/title.txt
@@ -0,0 +1 @@
+Evil Insult Generator
diff --git a/fastlane/metadata/android/bg-BG/video.txt b/fastlane/metadata/android/bg-BG/video.txt
@@ -0,0 +1 @@
+https://youtu.be/6UONhJ6lKL8
diff --git a/fastlane/metadata/android/bn-BD/full_description.txt b/fastlane/metadata/android/bn-BD/full_description.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 অন্য ইভিল অ্যাপের বদলে কেন আপনি ইভিল ইনসাল্ট উৎপাদক ডাউনলোড করবেন?
 
 <b>সরলতা</b>
@@ -27,33 +26,3 @@
 
 <b>⚠️ সতর্কতা ⚠️</b>
 অনেক ইনসাল্ট অ্যাপ-উত্পাদিত কিছু লোককে বিরক্ত করতে পারে, তাই আপনি কার সাথে এই ইনসাল্ট ব্যবহার করছেন সে সম্পর্কে আপনাকে সতর্ক থাকতে হবে. এই অ্যাপ্লিকেশন শুধুমাত্র প্রাপ্তবয়স্ক ব্যবহারকারীদের জন্য.
-=======
-Why should you download the Evil Insult Generator, as opposed to another insult app?
-
-<b>Simplicity</b>
-The interface is user-friendly, and the insults are all of high quality. The app was developed to provide you with a pleasurable experience.
-On the app's main screen, you'll have the ability to generate and browse various evil insults. Using the app couldn't be easier, and it only takes a second to generate new insults. You can browse through them with a simple tap of your screen.
-
-<b>Free & Open Source</b>
-This app is completely free to use and will stay that way forever. The source code is available on GitHub. You do not have to worry about special memberships, annual subscriptions, or hidden costs to generate results and share them with others.
-
-<b>Sharing</b>
-We endeavored to simplify the process of using this app. You will be able to share insults produced by the Evil Insult Generator at no charge. Your insults can be shared with friends on various apps. 
-
-<b>Updated Regularly</b>
-The development team that created this app are always adding new insults to it. Each insult is easy to share, and others can use them, if desired. 
-But we need your support. Please send us your insults and we will review it. If we like it, the insult will be the newest addition to the app. 
-
-<b>A Huge Collection of Insults</b>
-This app does not have any shortage of insults that you can use. Many of them have a uniqueness that can’t be found anywhere else.
-Don't delay – download the evil insults app and come up with creative lines that you can use on just about anybody!
-We endeavor to optimize user experiences for everyone. Feedback is something we welcome. If you have a recommendation or suggestion, we would like to hear them. Don't hesitate to get in touch with us at [email protected]. In doing so, we will be able to optimize your experience and keep the app updated with cutting-edge insults.
-
-<b>ℹ️ Note ℹ️</b>
-- The source can be found here: https://github.com/EvilInsultGenerator/android-app/
-- Your assistance with app translation is very much appreciated: https://crowdin.com/project/evil-insult-generator-android/
-- Feel very welcome to send me your favorite insults so that I can add them
-
-<b>⚠️ Warning ⚠️</b>
-Many insults that are generated by the app will offend some people, and as such, you should be careful with whom you use these insults on. This app is for mature users only.
->>>>>>> origin/master
diff --git a/fastlane/metadata/android/bn-BD/short_description.txt b/fastlane/metadata/android/bn-BD/short_description.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 এটি আপনি পেতে পারেন সবচেয়ে বড় ইনসাল্টজনক অ্যাপ্লিকেশন!
-=======
-This is the greatest insults app you can get!
->>>>>>> origin/master
diff --git a/fastlane/metadata/android/bn-BD/title.txt b/fastlane/metadata/android/bn-BD/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-এভিল ইনসাল্ট জেনারেটর
-=======
-Evil Insult Generator
->>>>>>> origin/master
+এভিল ইনসাল্ট জেনারেটর
diff --git a/fastlane/metadata/android/bn-BD/video.txt b/fastlane/metadata/android/bn-BD/video.txt
@@ -0,0 +1 @@
+https://youtu.be/6UONhJ6lKL8
diff --git a/fastlane/metadata/android/ca-ES/full_description.txt b/fastlane/metadata/android/ca-ES/full_description.txt
@@ -0,0 +1,28 @@
+Why should you download the Evil Insult Generator, as opposed to another insult app?
+
+<b>Simplicity</b>
+The interface is user-friendly, and the insults are all of high quality. The app was developed to provide you with a pleasurable experience.
+On the app's main screen, you'll have the ability to generate and browse various evil insults. Using the app couldn't be easier, and it only takes a second to generate new insults. You can browse through them with a simple tap of your screen.
+
+<b>Free & Open Source</b>
+This app is completely free to use and will stay that way forever. The source code is available on GitHub. You do not have to worry about special memberships, annual subscriptions, or hidden costs to generate results and share them with others.
+
+<b>Sharing</b>
+We endeavored to simplify the process of using this app. You will be able to share insults produced by the Evil Insult Generator at no charge. Your insults can be shared with friends on various apps. 
+
+<b>Updated Regularly</b>
+The development team that created this app are always adding new insults to it. Each insult is easy to share, and others can use them, if desired. 
+But we need your support. Please send us your insults and we will review it. If we like it, the insult will be the newest addition to the app. 
+
+<b>A Huge Collection of Insults</b>
+This app does not have any shortage of insults that you can use. Many of them have a uniqueness that can’t be found anywhere else.
+Don't delay – download the evil insults app and come up with creative lines that you can use on just about anybody!
+We endeavor to optimize user experiences for everyone. Feedback is something we welcome. If you have a recommendation or suggestion, we would like to hear them. Don't hesitate to get in touch with us at [email protected]. In doing so, we will be able to optimize your experience and keep the app updated with cutting-edge insults.
+
+<b>ℹ️ Note ℹ️</b>
+- The source can be found here: https://github.com/EvilInsultGenerator/android-app/
+- Your assistance with app translation is very much appreciated: https://crowdin.com/project/evil-insult-generator-android/
+- Feel very welcome to send me your favorite insults so that I can add them
+
+<b>⚠️ Warning ⚠️</b>
+Many insults that are generated by the app will offend some people, and as such, you should be careful with whom you use these insults on. This app is for mature users only.
diff --git a/fastlane/metadata/android/ca-ES/short_description.txt b/fastlane/metadata/android/ca-ES/short_description.txt
@@ -0,0 +1 @@
+This is the greatest insults app you can get!
diff --git a/fastlane/metadata/android/ca-ES/title.txt b/fastlane/metadata/android/ca-ES/title.txt
@@ -0,0 +1 @@
+Evil Insult Generator
diff --git a/fastlane/metadata/android/ca-ES/video.txt b/fastlane/metadata/android/ca-ES/video.txt
@@ -0,0 +1 @@
+https://youtu.be/6UONhJ6lKL8
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/1.txt b/fastlane/metadata/android/cs-CZ/changelogs/1.txt
@@ -0,0 +1 @@
+Kompletní přepsání a změněné jméno balíčku (nově com.evilinsult namísto com.evilinsult.android)
diff --git a/fastlane/metadata/android/cs-CZ/full_description.txt b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Proč byste si měli stáhnout Evil Insult Generator a ne jinou aplikaci na urážky?
 
 <b>Jednoduchost</b>
@@ -27,33 +26,3 @@ Snažíme se optimalizovat uživatelský zážitek pro všechny. Zpětná vazba
 
 <b>⚠️ Varování ⚠️</b>
 Mnoho urážek, které aplikace generuje, může některé lidi urazit, a proto byste měli být opatrní, na koho tyto urážky použijete. Tato aplikace je určena pouze pro dospělé uživatele.
-=======
-Why should you download the Evil Insult Generator, as opposed to another insult app?
-
-<b>Simplicity</b>
-The interface is user-friendly, and the insults are all of high quality. The app was developed to provide you with a pleasurable experience.
-On the app's main screen, you'll have the ability to generate and browse various evil insults. Using the app couldn't be easier, and it only takes a second to generate new insults. You can browse through them with a simple tap of your screen.
-
-<b>Free & Open Source</b>
-This app is completely free to use and will stay that way forever. The source code is available on GitHub. You do not have to worry about special memberships, annual subscriptions, or hidden costs to generate results and share them with others.
-
-<b>Sharing</b>
-We endeavored to simplify the process of using this app. You will be able to share insults produced by the Evil Insult Generator at no charge. Your insults can be shared with friends on various apps. 
-
-<b>Updated Regularly</b>
-The development team that created this app are always adding new insults to it. Each insult is easy to share, and others can use them, if desired. 
-But we need your support. Please send us your insults and we will review it. If we like it, the insult will be the newest addition to the app. 
-
-<b>A Huge Collection of Insults</b>
-This app does not have any shortage of insults that you can use. Many of them have a uniqueness that can’t be found anywhere else.
-Don't delay – download the evil insults app and come up with creative lines that you can use on just about anybody!
-We endeavor to optimize user experiences for everyone. Feedback is something we welcome. If you have a recommendation or suggestion, we would like to hear them. Don't hesitate to get in touch with us at [email protected]. In doing so, we will be able to optimize your experience and keep the app updated with cutting-edge insults.
-
-<b>ℹ️ Note ℹ️</b>
-- The source can be found here: https://github.com/EvilInsultGenerator/android-app/
-- Your assistance with app translation is very much appreciated: https://crowdin.com/project/evil-insult-generator-android/
-- Feel very welcome to send me your favorite insults so that I can add them
-
-<b>⚠️ Warning ⚠️</b>
-Many insults that are generated by the app will offend some people, and as such, you should be careful with whom you use these insults on. This app is for mature users only.
->>>>>>> origin/master
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2.jpg b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3.jpg b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/1.png
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/2.png
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/3.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/3.png
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/1.jpg b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/1.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/2.jpg b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/2.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/3.jpg b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/3.jpg
diff --git a/fastlane/metadata/android/cs-CZ/short_description.txt b/fastlane/metadata/android/cs-CZ/short_description.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 Toto je nejlepší aplikace urážek, kterou můžete získat!
-=======
-This is the greatest insults app you can get!
->>>>>>> origin/master
diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt
@@ -0,0 +1 @@
+Evil Insult Generator
diff --git a/fastlane/metadata/android/cs-CZ/video.txt b/fastlane/metadata/android/cs-CZ/video.txt
@@ -0,0 +1 @@
+https://youtu.be/6UONhJ6lKL8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		هذا هو أعظم تطبيق إهانات يمكنك الحصول عليه!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Това е най-доброто приложение за обиди, което можете да свалите!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Kompletní přepsání a změněné jméno balíčku (nově com.evilinsult namísto com.evilinsult.android)