From 9d4529b06b159c54fe6d7f7cc24e0ceb6d20d9be Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Thu, 22 Oct 2020 18:15:07 +0200
Subject: [PATCH] Initial rebrand

---
 app/build.gradle                              |  2 +-
 .../card_locker/BarcodeImageWriterTask.java   |  2 +-
 .../card_locker/BarcodeSelectorActivity.java  |  2 +-
 .../card_locker/CardShortcutConfigure.java    |  2 +-
 .../java/protect/card_locker/DBHelper.java    |  2 +-
 .../card_locker/ImportExportActivity.java     |  4 +--
 .../protect/card_locker/ImportExportTask.java |  2 +-
 .../card_locker/LoyaltyCardEditActivity.java  |  2 +-
 .../card_locker/LoyaltyCardViewActivity.java  |  2 +-
 .../protect/card_locker/MainActivity.java     |  4 ++-
 .../card_locker/MultiFormatExporter.java      |  2 +-
 .../card_locker/MultiFormatImporter.java      |  2 +-
 app/src/main/res/values-cs/strings.xml        |  1 -
 app/src/main/res/values-de/strings.xml        |  1 -
 app/src/main/res/values-el-rGR/strings.xml    |  1 -
 app/src/main/res/values-es/strings.xml        |  1 -
 app/src/main/res/values-fr/strings.xml        |  1 -
 app/src/main/res/values-it/strings.xml        |  1 -
 app/src/main/res/values-lt/strings.xml        |  1 -
 app/src/main/res/values-nb-rNO/strings.xml    |  1 -
 app/src/main/res/values-night/colors.xml      |  6 ++---
 app/src/main/res/values-nl/strings.xml        |  1 -
 app/src/main/res/values-pl/strings.xml        |  1 -
 app/src/main/res/values-ru/strings.xml        |  1 -
 app/src/main/res/values-sk/strings.xml        |  1 -
 app/src/main/res/values-sl/strings.xml        |  1 -
 app/src/main/res/values/colors.xml            |  6 ++---
 app/src/main/res/values/constants.xml         |  4 +--
 app/src/main/res/values/strings.xml           | 25 +++++++++---------
 docs/README.md                                | 26 +++++++++----------
 privacy-policy.md => docs/privacy-policy.md   |  8 +++---
 docs/share.md                                 | 12 ++++-----
 32 files changed, 59 insertions(+), 69 deletions(-)
 rename privacy-policy.md => docs/privacy-policy.md (92%)

diff --git a/app/build.gradle b/app/build.gradle
index 89ec24f80..d769ce2a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "protect.card_locker"
+        applicationId "me.hackerchick.catima"
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 39
diff --git a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
index 60ac03c0d..58231c9a7 100644
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -21,7 +21,7 @@ import java.lang.ref.WeakReference;
  */
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
diff --git a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
index 0c00615b7..9e1c29830 100644
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class BarcodeSelectorActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
index 2917d703d..212f435a7 100644
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -17,7 +17,7 @@ import android.widget.Toast;
  */
 public class CardShortcutConfigure extends AppCompatActivity
 {
-    static final String TAG = "LoyaltyCardLocker";
+    static final String TAG = "Catima";
 
     @Override
     public void onCreate(Bundle bundle)
diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index 6952accae..3eb49cbda 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -9,7 +9,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 
 public class DBHelper extends SQLiteOpenHelper
 {
-    public static final String DATABASE_NAME = "LoyaltyCards.db";
+    public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
     public static final int DATABASE_VERSION = 3;
 
diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java
index e2f96f31d..73ea4d19e 100644
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -34,7 +34,7 @@ import java.util.List;
 
 public class ImportExportActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
     private static final int CHOOSE_EXPORT_LOCATION = 2;
@@ -73,7 +73,7 @@ public class ImportExportActivity extends AppCompatActivity
         final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
         intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
         intentCreateDocumentAction.setType("text/csv");
-        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "LoyaltyCardKeychain.csv");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
 
         Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
diff --git a/app/src/main/java/protect/card_locker/ImportExportTask.java b/app/src/main/java/protect/card_locker/ImportExportTask.java
index ab54c9ef3..8537fbe99 100644
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -15,7 +15,7 @@ import java.nio.charset.Charset;
 
 class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private Activity activity;
     private boolean doImport;
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index b6ac2cc41..54f9079a3 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -34,7 +34,7 @@ import java.io.InvalidObjectException;
 
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
-    private static final String TAG = "CardLocker";
+    private static final String TAG = "Catima";
     protected static final String NO_BARCODE = "_NO_BARCODE_";
 
     protected static final int SELECT_BARCODE_REQUEST = 1;
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index f52de980e..7a704ad91 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -36,7 +36,7 @@ import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardViewActivity extends AppCompatActivity
 {
-    private static final String TAG = "CardLocker";
+    private static final String TAG = "Catima";
     private static final double LUMINANCE_MIDPOINT = 0.5;
 
     TextView cardIdFieldView;
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 6488d84ee..024ca6aeb 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -39,7 +39,7 @@ import protect.card_locker.preferences.SettingsActivity;
 
 public class MainActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
     private static final int MAIN_REQUEST_CODE = 1;
 
     private Menu menu;
@@ -371,6 +371,8 @@ public class MainActivity extends AppCompatActivity
                             "</a>") +
             "</p><hr/><p>" +
             String.format(getString(R.string.app_copyright_fmt), year) +
+            "</p><p>" +
+            getString(R.string.app_copyright_old) +
             "</p><hr/><p>" +
             getString(R.string.app_license) +
             "</p><hr/><p>" +
diff --git a/app/src/main/java/protect/card_locker/MultiFormatExporter.java b/app/src/main/java/protect/card_locker/MultiFormatExporter.java
index 68b01e761..5298e2ad7 100644
--- a/app/src/main/java/protect/card_locker/MultiFormatExporter.java
+++ b/app/src/main/java/protect/card_locker/MultiFormatExporter.java
@@ -7,7 +7,7 @@ import java.io.OutputStreamWriter;
 
 public class MultiFormatExporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to export data to the output stream in the
diff --git a/app/src/main/java/protect/card_locker/MultiFormatImporter.java b/app/src/main/java/protect/card_locker/MultiFormatImporter.java
index 3d5593868..a4ab4c83c 100644
--- a/app/src/main/java/protect/card_locker/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/MultiFormatImporter.java
@@ -7,7 +7,7 @@ import java.io.InputStreamReader;
 
 public class MultiFormatImporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to import data from the input stream of the
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1b9055017..0fa9de666 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Přidat</string>
 
     <string name="noGiftCards">ZAtím némáte žádné věrnostní karty. Klikněte na tlačítko "+" (plus) nahoře a začněte.\n\nLoyalty Card Locker umožňuje nosit své věrnostní karty v telefonu, takže jsou vždy na dosah.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f6445e6e7..ea6fc810c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_search">Suche</string>
     <string name="action_add">Neu</string>
 
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index e35d883e4..06a1d3c7e 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Προσθήκη</string>
 
     <string name="noGiftCards">Δεν έχετε κάρτες προς το παρόν. Πατήστε το κουμπί \"+\" (συν) στο πάνω μέρος για να ξεκινήσετε.\n\nΤο Loyalty Card Keychain σας δίνει τη δυνατότητα να έχετε τις κάρτες σας στο τηλέφωνο σας, έτσι ώστε να τις έχετε πάντα μαζί σας.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a512e8a19..8b729423b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Cartera para Tarjetas de Fidelización.</string>
     <string name="action_add">Añadir</string>
 
     <string name="noGiftCards">Actualmente no tienes ninguna tarjeta guardada. Presiona el botón \"+\" para comenzar.\n\nEsta cartera te permite llevar tus tarjetas de fidelización en tu teléfono para que estén siempre a tu alcance.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8f5194840..445fd99dc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Ajouter</string>
 
     <string name="noGiftCards">Aucune carte de fidélité enregistrée. Appuyez sur le bouton \"+\" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5f89dbe0b..a7cba28d6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Carte fedeltà</string>
     <string name="action_search">Cerca</string>
     <string name="action_add">Aggiungi</string>
 
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f7fab0fc2..02e1333d3 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Pridėti</string>
 
     <string name="noGiftCards">Šiuo metu neturite nė vienos įvestos lojalumo kortelės. Paspauskite "+" (pliuso) pliuso mygtuką, kad pradėtumėte.\n\nLoyalty Card Locker leidžia Jums visada nešiotis lojalumo kortelių informaciją savo telefone ar planšetėje, taip jos visada pasiekiamos.</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 7fe31e5d9..b70fe8926 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Kundekortknippe</string>
     <string name="action_add">Legg til</string>
     <string name="noGiftCards">Du har ingen kundekort for øyeblikket. Klikk på \"+\" (pluss)-knappen øverst for å komme igang.\n\nDa har du dem alltid hendig.</string>
     <string name="storeName">Butikk</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 766606060..96cf9aace 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,9 +2,9 @@
 <!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <!-- Colors manually flipped to dark variants -->
 <resources>
-    <color name="colorPrimary">#3f51b5</color>
-    <color name="colorPrimaryLight">#757de8</color>
-    <color name="colorPrimaryDark">#002984</color>
+    <color name="colorPrimary">#B53F3F</color>
+    <color name="colorPrimaryLight">#E87575</color>
+    <color name="colorPrimaryDark">#840000</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ba0c1e436..dd7af601e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Klantenkaartkluis</string>
     <string name="action_search">Zoeken</string>
     <string name="action_add">Toevoegen</string>
 
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 371633ce2..8971c1cd4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_search">Szukaj</string>
     <string name="action_add">Dodaj</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 748fe2b63..8dc56490e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Карты лояльности</string>
     <string name="action_search">Поиск</string>
     <string name="action_add">Добавить карту</string>
 
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 76b43f11d..d4150efef 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Vernostné karty</string>
     <string name="action_add">Pridať</string>
 
     <string name="noGiftCards">Zatiaľ nemáte žiadne vernostné karty. Kliknite na tlačidlo \"+\" (plus) vyššie a začnite.\n\nAplikácia Vernostné karty umožňuje nosiť svoje vernostné karty v telefóne, kde sú vždy na dosah.</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index d322cfdb7..2dbb716b9 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,7 +1,6 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Kartice zvestobe</string>
     <string name="action_add">Dodaj</string>
 
     <string name="noGiftCards">Trenutno nimate shranjene nobene kartice zvestobe. Kliknite  \"+\" (plus) na vrhu, da jih dodate.\n\n Aplikacija Kartice zvestobe Vam omogoča, da imate kartice zvestobe shranjene na Vašem telefonu in vedno v dosegu roke.</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 19c265c60..06b895547 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <resources>
-    <color name="colorPrimary">#3f51b5</color>
-    <color name="colorPrimaryLight">#757de8</color>
-    <color name="colorPrimaryDark">#002984</color>
+    <color name="colorPrimary">#B53F3F</color>
+    <color name="colorPrimaryLight">#E87575</color>
+    <color name="colorPrimaryDark">#840000</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index 7ab3b26e4..45c05623b 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_revision_url" translatable="false">https://github.com/brarcher/loyalty-card-locker/releases</string>
-    <string name="app_webpage_url" translatable="false">https://github.com/brarcher/loyalty-card-locker</string>
+    <string name="app_revision_url" translatable="false">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="app_webpage_url" translatable="false">https://github.com/TheLastProject/Catima</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b01f26dc2..207178c93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,12 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="app_name" translatable="false">Catima</string>
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
 
-    <string name="noGiftCards">You don\'t have any loyalty cards at the moment. Click the "+" (plus) button up top to get started.\n\nLoyalty Card Locker lets you carry your loyalty cards on your phone, so they are always within reach.</string>
-    <string name="noMatchingGiftCards">No loyalty cards match the search filter. Please try some different terms.</string>
+    <string name="noGiftCards">You don\'t have any cards at the moment. Click the "+" (plus) button up top to get started.\n\nCatima lets you carry your loyalty cards on your phone, so they are always within reach.</string>
+    <string name="noMatchingGiftCards">No cards match the search filter. Please try some different terms.</string>
 
     <string name="storeName">Store</string>
     <string name="note">Note</string>
@@ -24,15 +24,15 @@
     <string name="confirm">Confirm</string>
     <string name="lockScreen">Block Rotation</string>
     <string name="unlockScreen">Unblock Rotation</string>
-    <string name="deleteTitle">Remove Loyalty Card</string>
+    <string name="deleteTitle">Remove Card</string>
     <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
     <string name="sendLabel">Send&#8230;</string>
     <string name="addedShortcut">Added shortcut</string>
-    <string name="editCardTitle">Edit Loyalty Card</string>
-    <string name="addCardTitle">Add Loyalty Card</string>
+    <string name="editCardTitle">Edit Card</string>
+    <string name="addCardTitle">Add Card</string>
     <string name="scanCardBarcode">Scan Card\'s Barcode</string>
     <string name="cardShortcut">Card Shortcut</string>
     <string name="noCardsMessage">There are no cards, add one first</string>
@@ -65,7 +65,8 @@
     <string name="importOptionApplicationButton">Use external application</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2019-<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_old">Based on Loyalty Card Locker, copyright 2016-2020 Branden Archer.</string>
     <string name="app_license">Licensed under the GPLv3.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
@@ -81,7 +82,7 @@
     <string name="thumbnailDescription">Thumbnail for card</string>
 
     <string name="startIntro">Start Intro</string>
-    <string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
+    <string name="intro1Title">Welcome to Catima\n</string>
     <string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
     <string name="intro2Title">Adding Cards\n</string>
     <string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
@@ -125,10 +126,10 @@
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
     <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
 
-    <string name="intent_import_card_from_url">Import loyalty card</string>
-    <string name="intent_import_card_from_url_share_text">I want to share a loyalty card with you</string>
-    <string name="intent_import_card_from_url_host" translatable="false">brarcher.github.io</string>
-    <string name="intent_import_card_from_url_path_prefix" translatable="false">/loyalty-card-locker/share</string>
+    <string name="intent_import_card_from_url">Import into Catima</string>
+    <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
+    <string name="intent_import_card_from_url_host" translatable="false">thelastproject.github.io</string>
+    <string name="intent_import_card_from_url_path_prefix" translatable="false">/Catima/share</string>
     <string name="importSuccessful">Successfully imported loyalty card data</string>
     <string name="exportSuccessful">Successfully exported loyalty card data</string>
 </resources>
diff --git a/docs/README.md b/docs/README.md
index 289e6050a..bc769d05c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,9 +1,9 @@
-# Loyalty Card Keychain
-[![Build Status](https://travis-ci.org/brarcher/loyalty-card-locker.svg?branch=master)](https://travis-ci.org/brarcher/loyalty-card-locker)
+# Catima
+[![Build Status](https://travis-ci.org/TheLastProject/Catima.svg?branch=master)](https://travis-ci.org/TheLastProject/Catima)
 
-<a href="https://f-droid.org/repository/browse/?fdid=protect.card_locker" target="_blank">
-<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
-<a href="https://play.google.com/store/apps/details?id=protect.card_locker" target="_blank">
+<a href="https://f-droid.org/repository/browse/?fdid=me.hackerchick.catima" target="_blank">
+<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
+<a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
 
 Stores all of your store loyalty cards on your phone, removing the need to carry them around.  Currently the following barcode types are supported:
@@ -22,13 +22,13 @@ Stores all of your store loyalty cards on your phone, removing the need to carry
 
 # Screenshots
 
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)
 
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)
 
 # Building
 
@@ -47,7 +47,7 @@ Windows:
 
 # Translating
 
-If you are interested in translating this application to another language, find the project listing on [Transifex](https://www.transifex.com/na-243/loyalty-card-locker).
+We are going to set up a translation platform soon, please check back later.
 
 # Thanks
 
@@ -55,4 +55,4 @@ This application uses the following image:
 - [Save](https://thenounproject.com/term/save/716011) by [Bernar Novalyi](https://thenounproject.com/bernar.novalyi)
 
 # Note from Developer
-The developer is currently on hiatus from the project. Questions and pull requests may not be looked at for some time. Apologies in advance.
+This application is based on the great [Loyalty Card Locker](https://github.com/brarcher/loyalty-card-locker) by [Branden Archer](https://github.com/brarcher). This fork was created due to the original developer having stopped development of this app.
diff --git a/privacy-policy.md b/docs/privacy-policy.md
similarity index 92%
rename from privacy-policy.md
rename to docs/privacy-policy.md
index 2cb74dfee..a3e9a95a9 100644
--- a/privacy-policy.md
+++ b/docs/privacy-policy.md
@@ -1,6 +1,6 @@
 # PRIVACY POLICY FOR LOYALTY CARD KEYCHAIN
 
-This privacy policy governs your use of the software application Loyalty Card Keychain (“Application”) for mobile devices
+This privacy policy governs your use of the software application Catima (“Application”) for mobile devices
 that was created by Protect. The Application is designed to store and display barcodes.
 
 # What information does the Application obtain and how is it used?
@@ -48,8 +48,8 @@ not delete such emails.
 # Children
 
 This Application is not used to knowingly solicit data from or market to children under the age of 13. If a parent or
-guardian becomes aware that his or her child has provided us with information without their consent, he or she should
-contact us at protect.github@gmail.com. We will delete such information from our files within a reasonable time.
+guardian becomes aware that his or her child has provided us with information without their consent, they should
+contact us at sylvia+googleplay@hackerchick.me. We will delete such information from our files within a reasonable time.
 
 # Security
 
@@ -67,4 +67,4 @@ checking this history of this file in GitHub.
 
 # Contact us
 If you have any questions regarding privacy while using the Application, or have questions about our practices,
-please contact us via email at protect.github@gmail.com.
+please contact us via email at sylvia+googleplay@hackerchick.me.
diff --git a/docs/share.md b/docs/share.md
index c4d1ed8c6..2b9fe3267 100644
--- a/docs/share.md
+++ b/docs/share.md
@@ -1,10 +1,10 @@
-# Shared Loyalty Card
+# Shared Card
 
-Someone wants to share a loyalty card with you. To import this loyalty card, you will first need to install the Loyalty Card Locker app. It is free, Open Source and contains no ads.
+Someone wants to share a card with you. To import this card, you will first need to install the Catima app. It is free, Open Source and contains no ads.
 
-<a href="https://f-droid.org/repository/browse/?fdid=protect.card_locker" target="_blank">
-<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
-<a href="https://play.google.com/store/apps/details?id=protect.card_locker" target="_blank">
+<a href="https://f-droid.org/repository/browse/?fdid=me.hackerchick.catima" target="_blank">
+<img src="https://f-droidgitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
+<a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
 
-After installing the app, just click the link you were given again and choose "Import loyalty card".
+After installing the app, just click the link you were given again and choose "Import into Catima".