Merge pull request #2562 from quran/update_branch_name

Update name of branch
quran · Jan 28, 2024 · 49d42ad · 49d42ad
2 parents 60ce69f + 9f838bb
commit 49d42ad
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Android Pull Request
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/post_merge.yml b/.github/workflows/post_merge.yml
@@ -2,7 +2,7 @@ name: Upload Dependency List and Debug App
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 concurrency:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <div align="center">
 
-<img src="https://raw.githubusercontent.com/quran/quran_android/master/app/src/madani/res/drawable-xxhdpi/icon.png" alt='Quran for Android logo'/>
+<img src="https://raw.githubusercontent.com/quran/quran_android/main/app/src/madani/res/drawable-xxhdpi/icon.png" alt='Quran for Android logo'/>
 
 # Quran for Android
 
@@ -30,11 +30,11 @@ This is a simple (Madani based) Quran app for Android.
 
 If you'd like to contribute, please take a look at the [PRs Welcome](https://github.com/quran/quran_android/issues?q=is%3Aissue+is%3Aopen+label%3A%22PRs+Welcome%22) label on the issue tracker. For new features, please open an issue to discuss it before beginning implementation.
 
-Use [`quran_android-code_style.xml`](https://github.com/quran/quran_android/blob/master/quran_android-code_style.xml) for Android Studio / IntelliJ code styles. Import it by copying it to the Android Studio/IntelliJ IDEA codestyles folder. For Android Studio, that folder is located at `~/.AndroidStudio[Version]/config/codestyles` (the root folder name may differ depending on the host machine and Android Studio version, but the rest of the path should be same). After copying the `quran_android-code_style.xml`, go to Code Style preferences screen and choose `quran_android-code_style` from Code Style Schemes.
+Use [`quran_android-code_style.xml`](https://github.com/quran/quran_android/blob/main/quran_android-code_style.xml) for Android Studio / IntelliJ code styles. Import it by copying it to the Android Studio/IntelliJ IDEA codestyles folder. For Android Studio, that folder is located at `~/.AndroidStudio[Version]/config/codestyles` (the root folder name may differ depending on the host machine and Android Studio version, but the rest of the path should be same). After copying the `quran_android-code_style.xml`, go to Code Style preferences screen and choose `quran_android-code_style` from Code Style Schemes.
 
 Please set your Android studio kotlin code style based on [Kotlin Coding Conventions](https://kotlinlang.org/docs/reference/coding-conventions.html). You can configure it from menu Settings | Editor | Code Style | Kotlin, click on "Set from…" link in the upper right corner, and select "Predefined style / Kotlin style guide" from the menu.
 
-May Allah reward all the awesome [Contributors and Translators](https://github.com/quran/quran_android/blob/master/CONTRIBUTORS.md).
+May Allah reward all the awesome [Contributors and Translators](https://github.com/quran/quran_android/blob/main/CONTRIBUTORS.md).
 
 
 ## Setup

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -106,8 +106,6 @@
   <string name="about_contributors">Bijdragers</string>
   <string name="about_contributors_summary">Een lijst met mensen die hebben bijgedragen aan de
     ontwikkeling van Koran voor Android</string>
-  <string name="about_contributors_url" translatable="false">
-    https://github.com/quran/quran_android/blob/master/CONTRIBUTORS.md</string>
 
   <!-- help -->
   <string name="help_title">Veel Gestelde Vragen</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -95,7 +95,7 @@
   <string name="about_others">Others</string>
   <string name="about_contributors">Contributors</string>
   <string name="about_contributors_summary">A list of people who contributed to the development of Quran for Android</string>
-  <string name="about_contributors_url" translatable="false">https://github.com/quran/quran_android/blob/master/CONTRIBUTORS.md</string>
+  <string name="about_contributors_url" translatable="false">https://github.com/quran/quran_android/blob/main/CONTRIBUTORS.md</string>
 
   <!-- help -->
   <string name="help_title">Frequently Asked Questions</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Upload Dependency List and Debug App @@
     on:
       push:
         branches:
-          - master
+          - main
       workflow_dispatch:
     concurrency:
@@ Expand Down @@