Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json

app/appearance/langs/en_US.json

@@ -1,4 +1,9 @@
 {
+  "cardShowAnswer": "Show Answer",
+  "cardRatingAgain": "Again",
+  "cardRatingHard": "Hard",
+  "cardRatingGood": "Good",
+  "cardRatingEasy": "Easy",
   "pdfIsLoading": "PDF is loading, please try again later",
   "addToDeck": "Add to Deck...",
   "quickMakeCard": "Quick make card",

app/appearance/langs/es_ES.json

@@ -1,5 +1,10 @@
 {
   "pdfIsLoading": "El PDF se está cargando, inténtalo de nuevo más tarde",
+  "cardShowAnswer": "Afficher la réponse",
+  "cardRatingAgain": "Otra vez",
+  "cardRatingHard": "Difícil",
+  "cardRatingGood": "Bueno",
+  "cardRatingEasy": "Fácil",
   "addToDeck": "Agregar a la plataforma...",
   "quickMakeCard": "Tarjeta de creación rápida",
   "allAttrs": "Todos los nombres de atributos y valores de atributos",

app/appearance/langs/fr_FR.json

@@ -1,4 +1,9 @@
 {
+  "cardShowAnswer": "Afficher la réponse",
+  "cardRatingAgain": "Encore",
+  "cardRatingHard": "Difficile",
+  "cardRatingGood": "Bien",
+  "cardRatingEasy": "Facile",
   "pdfIsLoading": "Le PDF est en cours de chargement, veuillez réessayer plus tard",
   "addToDeck": "Ajouter au deck...",
   "quickMakeCard": "Carte de création rapide",

app/appearance/langs/zh_CHT.json

@@ -1,5 +1,10 @@
 {
   "pdfIsLoading": "PDF 正在加載中，請稍後再試",
+  "cardShowAnswer": "顯示答案",
+  "cardRatingAgain": "重來",
+  "cardRatingHard": "困難",
+  "cardRatingGood": "一般",
+  "cardRatingEasy": "輕鬆",
   "addToDeck": "添加到卡包...",
   "quickMakeCard": "快速制卡",
   "allAttrs": "所有屬性名和屬性值",

app/appearance/langs/zh_CN.json

@@ -1,5 +1,10 @@
 {
   "pdfIsLoading": "PDF 正在加载中，请稍后再试",
+  "cardShowAnswer": "显示答案",
+  "cardRatingAgain": "重来",
+  "cardRatingHard": "困难",
+  "cardRatingGood": "一般",
+  "cardRatingEasy": "轻松",
   "addToDeck": "添加到卡包...",
   "quickMakeCard": "快速制卡",
   "allAttrs": "所有属性名和属性值",

app/src/assets/scss/business/_card.scss

@@ -24,7 +24,7 @@
       width: 90%;
 
       & > div {
-        font-size: 46px;
+        font-size: 32px;
         display: block;
         line-height: 46px;
         margin-bottom: 4px;

app/src/card/openCard.ts

@@ -54,35 +54,35 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
         ${window.siyuan.languages.noDueCard}
     </div>
     <div class="fn__flex card__action${blocks.length === 0 ? " fn__none" : ""}">
-        <button data-type="-1" class="b3-button fn__flex-1">Show (S)</button>
+        <button data-type="-1" class="b3-button fn__flex-1">${window.siyuan.languages.cardShowAnswer} (S)</button>
     </div>
     <div class="fn__flex card__action fn__none">
         <div>
             <span></span>
             <button data-type="0" aria-label="1 / j" class="b3-button b3-button--error b3-tooltips__s b3-tooltips">
                 <div>❌</div>
-                Again
+                ${window.siyuan.languages.cardRatingAgain} (1)
             </button>
         </div>
         <div>
             <span></span>
             <button data-type="1" aria-label="2 / k" class="b3-button b3-button--warning b3-tooltips__s b3-tooltips">
                 <div>😬</div>
-                Hard
+                ${window.siyuan.languages.cardRatingHard} (2)
             </button>
         </div>
         <div>
             <span></span>
             <button data-type="2" aria-label="3 / l" class="b3-button b3-button--info b3-tooltips__s b3-tooltips">
                 <div>😊</div>
-                Good
+                ${window.siyuan.languages.cardRatingGood} (3)
             </button>
         </div>
         <div>
             <span></span>
             <button data-type="3" aria-label="4 / ;" class="b3-button b3-button--success b3-tooltips__s b3-tooltips">
                 <div>🌈</div>
-                Easy
+                ${window.siyuan.languages.cardRatingEasy} (4)
             </button>
         </div>
     </div>

app/src/mobile/util/initFramework.ts

@@ -128,7 +128,7 @@ export const initFramework = () => {
         closePanel();
     });
     initEditorName();
-    if (window.siyuan.config.newbie) {
+    if (window.siyuan.config.openHelp) {
         mountHelp();
     }
     const transactionTipElement = document.getElementById("transactionTip");

app/src/types/index.d.ts

@@ -413,7 +413,7 @@ declare interface IConfig {
     api: {
         token: string
     }
-    newbie: boolean
+    openHelp: boolean
     system: {
         networkProxy: {
             host: string

app/src/util/onGetConfig.ts

@@ -176,7 +176,7 @@ export const onGetConfig = (isStart: boolean) => {
             resizeDrag();
         }, 200);
     });
-    if (window.siyuan.config.newbie) {
+    if (window.siyuan.config.openHelp) {
         mountHelp();
     }
     addGA();