From 51845b3cd978f7b809d3c4db7d8bf8bbc9006587 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 23 May 2020 00:42:31 +0300 Subject: [PATCH] husky: add new flavor to be able to override original Tusky strings. Restore strings from upstream --- app/build.gradle | 9 +- .../res/values-ca/strings.xml} | 2 - .../res/values-de/strings.xml} | 2 - .../res/values-es/strings.xml} | 2 - .../res/values-fr/strings.xml} | 2 - .../res/values-ja/strings.xml} | 4 +- .../res/values-ru/strings.xml} | 0 .../res/values-tr/strings.xml} | 0 .../res/values-uk/strings.xml} | 4 +- app/src/husky/res/values/donottranslate.xml | 9 ++ .../res/values/husky_donottranslate.xml | 0 app/src/husky/res/values/strings.xml | 125 ++++++++++++++++++ app/src/main/res/values/strings.xml | 102 +++++++------- 13 files changed, 195 insertions(+), 66 deletions(-) rename app/src/{main/res/values-ca/husky.xml => husky/res/values-ca/strings.xml} (91%) rename app/src/{main/res/values-de/husky.xml => husky/res/values-de/strings.xml} (88%) rename app/src/{main/res/values-es/husky.xml => husky/res/values-es/strings.xml} (92%) rename app/src/{main/res/values-fr/husky.xml => husky/res/values-fr/strings.xml} (89%) rename app/src/{main/res/values-ja/husky.xml => husky/res/values-ja/strings.xml} (78%) rename app/src/{main/res/values-ru/husky.xml => husky/res/values-ru/strings.xml} (100%) rename app/src/{main/res/values-tr/husky.xml => husky/res/values-tr/strings.xml} (100%) rename app/src/{main/res/values-uk/husky.xml => husky/res/values-uk/strings.xml} (89%) create mode 100644 app/src/husky/res/values/donottranslate.xml rename app/src/{main => husky}/res/values/husky_donottranslate.xml (100%) create mode 100644 app/src/husky/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index abdbd83b..9ce986d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ def buildnum = { android { compileSdkVersion 29 - //ndkVersion "20.1.5948944" + // ndkVersion "20.1.5948944" defaultConfig { applicationId APP_ID minSdkVersion 21 @@ -55,10 +55,13 @@ android { debug {} } - flavorDimensions "color" + flavorDimensions "husky", "color" productFlavors { - blue {} + husky { dimension "husky" } + + blue { dimension "color" } green { + dimension "color" applicationIdSuffix ".test" versionNameSuffix "-" + getGitSha() } diff --git a/app/src/main/res/values-ca/husky.xml b/app/src/husky/res/values-ca/strings.xml similarity index 91% rename from app/src/main/res/values-ca/husky.xml rename to app/src/husky/res/values-ca/strings.xml index 1ecc211a..d99794f7 100644 --- a/app/src/main/res/values-ca/husky.xml +++ b/app/src/husky/res/values-ca/strings.xml @@ -2,8 +2,6 @@ Respondre a - Oculta la conversa - Mostra la conversa Reaccionar Suprimir reacció diff --git a/app/src/main/res/values-de/husky.xml b/app/src/husky/res/values-de/strings.xml similarity index 88% rename from app/src/main/res/values-de/husky.xml rename to app/src/husky/res/values-de/strings.xml index 298ef5eb..1cb8ba3f 100644 --- a/app/src/main/res/values-de/husky.xml +++ b/app/src/husky/res/values-de/strings.xml @@ -1,6 +1,5 @@ - %s deaktivieren Reagieren Reaktion entfernen @@ -17,7 +16,6 @@ Benachrictigungen über neue Emojireaktionen Standardformatierungssyntax (wenn von der Instanz unterstützt) Ignorierte Nutzer verstecken - Reaktionen auf meine Nachrichten Antwort auf diff --git a/app/src/main/res/values-es/husky.xml b/app/src/husky/res/values-es/strings.xml similarity index 92% rename from app/src/main/res/values-es/husky.xml rename to app/src/husky/res/values-es/strings.xml index 30b5266c..2cc676d8 100644 --- a/app/src/main/res/values-es/husky.xml +++ b/app/src/husky/res/values-es/strings.xml @@ -2,8 +2,6 @@ Responder a - Ocultar conversación - Mostrar conversación Reaccionar Eliminar la reacción diff --git a/app/src/main/res/values-fr/husky.xml b/app/src/husky/res/values-fr/strings.xml similarity index 89% rename from app/src/main/res/values-fr/husky.xml rename to app/src/husky/res/values-fr/strings.xml index 7ed624a1..fd039a16 100644 --- a/app/src/main/res/values-fr/husky.xml +++ b/app/src/husky/res/values-fr/strings.xml @@ -6,7 +6,6 @@ Site internet de l\'application mes messages peuvent recevoir des réactions Répondre à - Réagir Supprimer la réaction Réaction de @@ -17,7 +16,6 @@ La taille du fichier dépasse la limite de l\'instance Activer %s Désactiver %s - Administrateur•rice Syntaxe de formatage par défaut (si supportée par l\'instance) diff --git a/app/src/main/res/values-ja/husky.xml b/app/src/husky/res/values-ja/strings.xml similarity index 78% rename from app/src/main/res/values-ja/husky.xml rename to app/src/husky/res/values-ja/strings.xml index 33d32ad0..6243f4d2 100644 --- a/app/src/main/res/values-ja/husky.xml +++ b/app/src/husky/res/values-ja/strings.xml @@ -1,8 +1,6 @@ 返信 - 会話をミユート - 会話をミュート解除 絵文字反応 誰が反応したか 可能にする %s @@ -11,4 +9,4 @@ アプリのウェブサイト 管理者 モデレーター - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/husky.xml b/app/src/husky/res/values-ru/strings.xml similarity index 100% rename from app/src/main/res/values-ru/husky.xml rename to app/src/husky/res/values-ru/strings.xml diff --git a/app/src/main/res/values-tr/husky.xml b/app/src/husky/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr/husky.xml rename to app/src/husky/res/values-tr/strings.xml diff --git a/app/src/main/res/values-uk/husky.xml b/app/src/husky/res/values-uk/strings.xml similarity index 89% rename from app/src/main/res/values-uk/husky.xml rename to app/src/husky/res/values-uk/strings.xml index 3b4476e0..4b377d08 100644 --- a/app/src/main/res/values-uk/husky.xml +++ b/app/src/husky/res/values-uk/strings.xml @@ -1,8 +1,6 @@ Відповісти - Приглушити бесіду - Скасувати приглушення бесіди Відреагувати Прибрати реакцію Хто відреагував @@ -20,4 +18,4 @@ Розмір файлу перевищує обмеження інстанції Синтакс форматування за замовчуванням (якщо підтримується інстанцією) мої пости мають емодзі реакції - \ No newline at end of file + diff --git a/app/src/husky/res/values/donottranslate.xml b/app/src/husky/res/values/donottranslate.xml new file mode 100644 index 00000000..667a942c --- /dev/null +++ b/app/src/husky/res/values/donottranslate.xml @@ -0,0 +1,9 @@ + + + + + https://husky.fwgs.ru + + + + diff --git a/app/src/main/res/values/husky_donottranslate.xml b/app/src/husky/res/values/husky_donottranslate.xml similarity index 100% rename from app/src/main/res/values/husky_donottranslate.xml rename to app/src/husky/res/values/husky_donottranslate.xml diff --git a/app/src/husky/res/values/strings.xml b/app/src/husky/res/values/strings.xml new file mode 100644 index 00000000..45638c73 --- /dev/null +++ b/app/src/husky/res/values/strings.xml @@ -0,0 +1,125 @@ + + + Reply to + React + Remove reaction + Who reacted + Enable %s + Disable %s + Stickers + + %s reacted by + + Application name + Application website + + Admin + Moderator + + File size exceeds instance limits + An error occurred while fetching sticker + + %s reacted with %s to your post + Emoji Reactions + Notifications about new emoji reactions + + Default formatting syntax(if supported by instance) + my posts are reacted with emojis + Hide muted users + Enable bigger custom emojis + Enable experimental Pleroma-FE stickers(if available) + + + Post visibility + Schedule post + Repeat + Remove repeats + Hide repeats + Show repeats + POST + POST! + Open repeat author + Show repeats + Repeat to original audience + Remove repeat + Open post + + Compose Post + + + Repeated + + Delete this post? + Delete and re-draft this post? + + Error sending post. + + %s repeated your post + %s favorited your post + Repeats + Notifications when your posts get repeated + Notifications when your posts get marked as favorite + + Show confirmation dialog before repeating + my posts are repeated + Show repeats + Always expand posts marked with content warnings + + + <b>%s</b> Repeat + <b>%s</b> Repeats + + Share post URL to… + Share post to… + Sending post… + Error sending post + Sending posts + A copy of the post has been saved to your drafts + + Share content of post + Share link to post + %s repeated + + Scheduled posts + Repeated by + Post + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37104d2e..91fa69c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ Permission to store media is required. Images and videos cannot both be attached to the same status. The upload failed. - Error sending post. + Error sending toot. Home Notifications @@ -27,7 +27,7 @@ Federated Direct Messages Tabs - Post + Toot Posts With replies Pinned @@ -41,11 +41,11 @@ Follow Requests Edit your profile Drafts - Scheduled posts + Scheduled toots Licenses \@%s - %s reposted + %s boosted Sensitive content Media hidden Click to view @@ -57,8 +57,8 @@ Nothing here. Nothing here. Pull down to refresh! - %s reposted your post - %s favorited your post + %s boosted your toot + %s favorited your toot %s followed you %s requested to follow you @@ -67,28 +67,28 @@ Quick Reply Reply - Repost - Remove repost + Boost + Remove boost Favorite Bookmark Remove favorite More Compose - Login! + Login with Mastodon Log Out Are you sure you want to log out of the account %1$s? Follow Unfollow Block Unblock - Hide reposts - Show reposts + Hide boosts + Show boosts Report Edit Delete Delete and re-draft - POST - POST! + TOOT + TOOT! Retry Close Profile @@ -122,18 +122,18 @@ Reject Search Drafts - Scheduled posts - Post visibility + Scheduled toots + Toot visibility Content warning Emoji keyboard - Schedule Post + Schedule Toot Reset Add Tab Links Mentions Hashtags - Open repost author - Show reposts + Open boost author + Show boosts Show favorites Hashtags @@ -149,8 +149,8 @@ Download media Downloading media - Share post URL to… - Share post to… + Share toot URL to… + Share toot to… Share media to… Sent! @@ -179,21 +179,21 @@ Connecting… The address or domain of any instance can be entered - here, such as mastodon.social, pleroma.site, expired.mentality.rip, and + here, such as mastodon.social, icosahedron.website, social.tchncs.de, and more! \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to join and create an account there.\n\nAn instance is a single place where your account is hosted, but you can easily communicate with and follow folks on other instances as though you were on the same site. - \n\nMore info can be found at joinmastodon.org, and a full list of instances can be found at fediverse.network. + \n\nMore info can be found at joinmastodon.org. Finishing Media Upload Uploading… Download Revoke the follow request? Unfollow this account? - Delete this post? - Delete and re-draft this [pst? + Delete this toot? + Delete and re-draft this toot? Are you sure you want to block all of %s? You will not see content from that domain in any public timelines or in your notifications. Your followers from that domain will be removed. Hide entire domain Block @%s? @@ -213,8 +213,8 @@ Notify me when mentioned followed - my posts are reposted follow requested + my posts are boosted my posts are favorited polls have ended Appearance @@ -238,7 +238,7 @@ Timeline filtering Tabs - Show reposts + Show boosts Show replies Download media previews Proxy @@ -268,12 +268,12 @@ Notifications about new mentions New Followers Notifications about new followers - Reposts - Notifications when your posts get reposted Follow Requests Notifications about follow requests + Boosts + Notifications when your toots get boosted Favorites - Notifications when your posts get marked as favorite + Notifications when your toots get marked as favorite Polls Notifications about polls that have ended @@ -287,9 +287,9 @@ Locked Account About - Husky %s - Powered by Husky - Husky is free and open-source software. + Tusky %s + Powered by Tusky + Tusky is free and open-source software. It is licensed under the GNU General Public License Version 3. You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html