Skip to content

Commit 7c3d631

Browse files
grigorevmpgrigorevmp
committed
qp:re 3.0.0: fixes
1 parent fdad02a commit 7c3d631

File tree

14 files changed

+77
-3
lines changed

14 files changed

+77
-3
lines changed

‎app/src/main/res/layout/activity_folder_view.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
android:id="@+id/tvNoPasswordsInFolder"
6666
android:layout_width="match_parent"
6767
android:layout_height="wrap_content"
68+
android:layout_marginStart="@dimen/base_margin"
69+
android:layout_marginEnd="@dimen/base_margin"
6870
android:text="@string/no_passwords_in_this_folder"
6971
android:gravity="center"
7072
android:visibility="gone"

‎app/src/main/res/layout/fragment_password.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165
android:elevation="@dimen/base_card_elevation"
166166
android:visibility="gone"
167167
app:backgroundTint="@color/white"
168+
app:iconTint="@color/black"
169+
app:tint="@color/fabTint"
170+
app:srcCompat="@drawable/plus"
168171
app:elevation="@dimen/base_card_elevation"
169172
app:layout_constraintBottom_toBottomOf="parent"
170173
app:layout_constraintEnd_toEndOf="parent"

‎app/src/main/res/layout/fragment_profile.xml

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,54 @@
188188
</LinearLayout>
189189
</androidx.cardview.widget.CardView>
190190

191+
<androidx.cardview.widget.CardView
192+
android:id="@+id/cvWarningAccountCard"
193+
android:layout_width="fill_parent"
194+
android:layout_height="wrap_content"
195+
android:layout_marginStart="@dimen/base_margin"
196+
android:layout_marginTop="@dimen/base_margin"
197+
android:layout_marginEnd="@dimen/base_margin"
198+
android:foreground="?android:attr/selectableItemBackground"
199+
app:cardBackgroundColor="?attr/colorPrimary"
200+
app:cardCornerRadius="@dimen/base_card_radius"
201+
app:cardElevation="@dimen/base_card_elevation"
202+
app:layout_constraintEnd_toEndOf="parent"
203+
app:layout_constraintStart_toStartOf="parent"
204+
app:layout_constraintTop_toBottomOf="@+id/cvWarningRulesCard">
205+
206+
<LinearLayout
207+
android:layout_width="wrap_content"
208+
android:layout_height="wrap_content"
209+
android:orientation="vertical"
210+
android:paddingTop="@dimen/small_margin"
211+
android:paddingBottom="@dimen/base_margin">
212+
213+
<TextView
214+
android:layout_width="match_parent"
215+
android:layout_height="wrap_content"
216+
android:layout_marginStart="@dimen/base_margin"
217+
android:layout_marginTop="@dimen/small_margin"
218+
android:layout_marginEnd="@dimen/base_margin"
219+
android:text="@string/where_do_my_passwords_store"
220+
android:textColor="@color/white"
221+
android:textStyle="bold" />
222+
223+
<TextView
224+
android:layout_width="match_parent"
225+
android:layout_height="wrap_content"
226+
android:layout_marginStart="@dimen/base_margin"
227+
android:layout_marginTop="@dimen/small_margin"
228+
android:layout_marginEnd="@dimen/base_margin"
229+
android:text="@string/password_storing"
230+
android:textColor="@color/white"
231+
android:visibility="visible"
232+
app:layout_constraintEnd_toEndOf="parent"
233+
app:layout_constraintStart_toStartOf="parent"
234+
app:layout_constraintTop_toBottomOf="@+id/doubleFAInfo" />
235+
236+
</LinearLayout>
237+
</androidx.cardview.widget.CardView>
238+
191239
<androidx.cardview.widget.CardView
192240
android:id="@+id/deleteCard"
193241
android:layout_width="wrap_content"
@@ -200,7 +248,7 @@
200248
app:cardElevation="@dimen/small_elevation"
201249
app:layout_constraintBottom_toBottomOf="parent"
202250
app:layout_constraintStart_toStartOf="parent"
203-
app:layout_constraintTop_toBottomOf="@+id/cvWarningRulesCard"
251+
app:layout_constraintTop_toBottomOf="@+id/cvWarningAccountCard"
204252
app:layout_constraintVertical_bias="1.0">
205253

206254
<ImageButton

‎app/src/main/res/values-de/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
<string name="avatar_emoji">Avatar etozhy</string>
200200
<string name="create_folder_config">Aktuelle Konfigurationsdetails</string>
201201
<string name="folder_creation">Ordner erstellen</string>
202+
<string name="password_storing">Im Moment haben alle Ihre Passwörter einen Platz. Ändern oder Löschen eines Kontos, ohne mit Geräten verknüpfte Passwörter zu löschen. Das Konto existiert nur, um zukünftige Cloud-Backups zu unterstützen. Wenn Sie alle gespeicherten Passwörter löschen möchten, sollten Sie entweder Ihre Gerätedaten zurücksetzen oder die App deinstallieren.</string>
203+
<string name="where_do_my_passwords_store">Wo werden meine Passwörter gespeichert?</string>
202204
<!-- Generated by Automatic String Resource Translation -->
203205
<!-- https://asrt.gluege.boerde.de -->
204206
</resources>

‎app/src/main/res/values-es/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,6 @@
184184
<string name="avatar_emoji">Avatar etozhy</string>
185185
<string name="no_passwords_in_this_folder">No hay contraseñas en esta carpeta</string>
186186
<string name="inputPassword2">Repita la contraseña</string>
187+
<string name="password_storing">Por el momento, todas sus contraseñas tienen un lugar para estar. Cambiar o eliminar una cuenta sin eliminar las contraseñas asociadas con los dispositivos. La cuenta existe solo para admitir copias de seguridad en la nube en el futuro. Si desea eliminar todas las contraseñas guardadas, debe restablecer los datos de su dispositivo o desinstalar la aplicación.</string>
188+
<string name="where_do_my_passwords_store">¿Dónde se almacenan mis contraseñas?</string>
187189
</resources>

‎app/src/main/res/values-fr/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
<string name="create_folder_config">Détails de la configuration actuelle</string>
200200
<string name="folder_creation">Créer le dossier</string>
201201
<string name="inputPassword2">Répéter le mot de passe</string>
202+
<string name="where_do_my_passwords_store">Où sont stockés mes mots de passe ?</string>
203+
<string name="password_storing">Pour le moment, tous vos mots de passe ont une place. Modifier ou supprimer un compte sans supprimer les mots de passe associés aux appareils. Le compte existe uniquement pour prendre en charge les sauvegardes dans le cloud à l\'avenir. Si vous souhaitez supprimer tous les mots de passe enregistrés, vous devez soit réinitialiser les données de votre appareil, soit désinstaller l\'application.</string>
202204
<!-- Generated by Automatic String Resource Translation -->
203205
<!-- https://asrt.gluege.boerde.de -->
204206
</resources>

‎app/src/main/res/values-hi/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,14 @@
193193
<string name="add_folder">फ़ोल्डर जोड़ें</string>
194194
<string name="new_pass">नया पासवर्ड:</string>
195195
<string name="delete">हटाएं</string>
196-
<string name="a_z" translatable="false">पासवर्डों</string>
197196
<string name="passwords">पासवर्डों</string>
198197
<string name="inputPassword2">पासवर्ड दोहराएं</string>
199198
<string name="folder_creation">फोल्डर बनाएं</string>
200199
<string name="create_folder_config">वर्तमान कॉन्फ़िगरेशन विवरण</string>
201200
<string name="avatar_emoji">अवतार</string>
202201
<string name="no_passwords_in_this_folder">इस फ़ोल्डर में कोई पासवर्ड नहीं है</string>
202+
<string name="where_do_my_passwords_store">मेरे पासवर्ड कहाँ स्टोर करते हैं?</string>
203+
<string name="password_storing">फिलहाल, आपके सभी पासवर्ड के लिए जगह है। उपकरणों से जुड़े पासवर्ड को हटाए बिना किसी खाते को बदलना या हटाना। खाता केवल भविष्य में क्लाउड बैकअप का समर्थन करने के लिए मौजूद है। यदि आप सभी सहेजे गए पासवर्ड हटाना चाहते हैं, तो आपको या तो अपना डिवाइस डेटा रीसेट करना चाहिए या ऐप को अनइंस्टॉल करना चाहिए।</string>
203204
<!-- Generated by Automatic String Resource Translation -->
204205
<!-- https://asrt.gluege.boerde.de -->
205206
</resources>

‎app/src/main/res/values-it/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@
197197
<string name="create_folder_config">Dettagli della configurazione attuale</string>
198198
<string name="folder_creation">Creare una cartella</string>
199199
<string name="inputPassword2">Ripeti la password</string>
200+
<string name="where_do_my_passwords_store">Dove vengono archiviate le mie password?</string>
201+
<string name="password_storing">Al momento, tutte le tue password hanno un posto dove stare. Modifica o eliminazione di un account senza eliminare le password associate ai dispositivi. L\'account esiste solo per supportare i backup su cloud in futuro. Se desideri eliminare tutte le password salvate, devi ripristinare i dati del dispositivo o disinstallare l\'app.</string>
200202
<!-- Generated by Automatic String Resource Translation -->
201203
<!-- https://asrt.gluege.boerde.de -->
202204
</resources>

‎app/src/main/res/values-ja/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@
197197
<string name="create_folder_config">現在の構成の詳細</string>
198198
<string name="avatar_emoji">アバターetozhy</string>
199199
<string name="no_passwords_in_this_folder">このフォルダにパスワードはありません</string>
200+
<string name="password_storing">現時点では、すべてのパスワードに場所があります。 デバイスに関連付けられているパスワードを削除せずにアカウントを変更または削除する。 アカウントは、将来のクラウドバックアップをサポートするためにのみ存在します。 保存されているすべてのパスワードを削除する場合は、デバイスデータをリセットするか、アプリをアンインストールする必要があります。</string>
201+
<string name="where_do_my_passwords_store">パスワードはどこに保存されますか？</string>
200202
<!-- Generated by Automatic String Resource Translation -->
201203
<!-- https://asrt.gluege.boerde.de -->
202204
</resources>

‎app/src/main/res/values-ko/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,6 @@
199199
<string name="create_folder_config">현재 구성 세부정보</string>
200200
<string name="avatar_emoji">아바타 에토시</string>
201201
<string name="no_passwords_in_this_folder">이 폴더에 암호가 없습니다</string>
202+
<string name="where_do_my_passwords_store">내 비밀번호는 어디에 저장되나요?</string>
203+
<string name="password_storing">현재 귀하의 모든 비밀번호는 제자리에 있습니다. 장치와 연결된 암호를 삭제하지 않고 계정을 변경하거나 삭제합니다. 계정은 향후 클라우드 백업을 지원하기 위해서만 존재합니다. 저장된 모든 비밀번호를 삭제하려면 기기 데이터를 재설정하거나 앱을 제거해야 합니다.</string>
202204
</resources>

0 commit comments

Comments
 (0)