i18n: add German translation, layout issues with longer translations.

Dialog headers (insulin, carbs, prime/fill) now lock proper at least
in English and German.
This commit is contained in:
Johannes Mockenhaupt 2018-05-13 13:34:39 +02:00
parent 24e672a7f8
commit 52da1feaf0
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
11 changed files with 27 additions and 33 deletions

View file

@ -11,27 +11,24 @@
android:padding="10dp"> android:padding="10dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:padding="5dp"
android:src="@drawable/icon_cp_pump_canula" /> android:src="@drawable/icon_cp_pump_canula" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="10dp" android:layout_gravity="center"
android:paddingLeft="15dp" android:layout_marginLeft="10dp"
android:paddingRight="15dp" android:layout_marginRight="10dp"
android:paddingTop="10dp"
android:text="@string/primefill" android:text="@string/primefill"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/colorInsulinButton" /> android:textColor="@color/colorInsulinButton" />

View file

@ -20,28 +20,25 @@
android:padding="10dp"> android:padding="10dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:padding="5dp"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/icon_cp_bolus_carbs" /> android:src="@drawable/icon_cp_bolus_carbs" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="10dp" android:layout_gravity="center"
android:paddingLeft="15dp" android:layout_marginLeft="10dp"
android:paddingRight="15dp" android:layout_marginRight="10dp"
android:paddingTop="10dp"
android:text="@string/carbs" android:text="@string/carbs"
android:textAlignment="center" android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/colorCarbsButton" /> android:textColor="@color/colorCarbsButton" />
</LinearLayout> </LinearLayout>

View file

@ -17,26 +17,23 @@
android:padding="10dp"> android:padding="10dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:padding="5dp"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/icon_bolus" /> android:src="@drawable/icon_bolus" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="10dp" android:layout_gravity="center"
android:paddingLeft="15dp" android:layout_marginLeft="10dp"
android:paddingRight="15dp" android:layout_marginRight="10dp"
android:paddingTop="10dp"
android:textAlignment="center"
android:text="@string/overview_insulin_label" android:text="@string/overview_insulin_label"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/colorInsulinButton" /> android:textColor="@color/colorInsulinButton" />
@ -59,7 +56,7 @@
android:id="@+id/newinsulin_record_only" android:id="@+id/newinsulin_record_only"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/don_t_bolus_record_only" /> android:text="@string/do_not_bolus_record_only" />
</LinearLayout> </LinearLayout>
@ -124,6 +121,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="5dp"
android:text="@string/insulin_unit_shortname" /> android:text="@string/insulin_unit_shortname" />
</LinearLayout> </LinearLayout>

View file

@ -29,7 +29,7 @@
android:id="@+id/newtreatment_record_only" android:id="@+id/newtreatment_record_only"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/don_t_bolus_record_only" /> android:text="@string/do_not_bolus_record_only" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

View file

@ -810,7 +810,7 @@
<string name="data_choices">Избор на данни</string> <string name="data_choices">Избор на данни</string>
<string name="allow_automated_crash_reporting">Позволява автоматично изпращане на данни за грешки и статистически данни до разработчиците чрез fabric.io service.</string> <string name="allow_automated_crash_reporting">Позволява автоматично изпращане на данни за грешки и статистически данни до разработчиците чрез fabric.io service.</string>
<string name="g5appnotdetected">Моля обновете G5 приложението до поддържана версия.</string> <string name="g5appnotdetected">Моля обновете G5 приложението до поддържана версия.</string>
<string name="don_t_bolus_record_only">Не доставяй болус, само запис</string> <string name="do_not_bolus_record_only">Не доставяй болус, само запис</string>
<string name="category">Категория</string> <string name="category">Категория</string>
<string name="subcategory">Подкатегория</string> <string name="subcategory">Подкатегория</string>
<string name="bolusrecordedonly">Болусът ще бъде само записан</string> <string name="bolusrecordedonly">Болусът ще бъде само записан</string>

View file

@ -810,7 +810,7 @@
<string name="start_eating_soon_tt">Spustit Dočasný cíl Blížící se jídlo</string> <string name="start_eating_soon_tt">Spustit Dočasný cíl Blížící se jídlo</string>
<string name="temptargetshort">DoCíl</string> <string name="temptargetshort">DoCíl</string>
<string name="insight_min">min</string> <string name="insight_min">min</string>
<string name="don_t_bolus_record_only">Nepouštět bolus, jen zaznamenat</string> <string name="do_not_bolus_record_only">Nepouštět bolus, jen zaznamenat</string>
<string name="subcategory">Podkategorie</string> <string name="subcategory">Podkategorie</string>
<string name="category">Kategorie</string> <string name="category">Kategorie</string>
<string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string> <string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string>

View file

@ -797,4 +797,6 @@
<string name="connectionsettings_title">Verbindungs-Einstellungen</string> <string name="connectionsettings_title">Verbindungs-Einstellungen</string>
<string formatted="false" name="objectivenotstarted">Zielsetzung %d nicht gestartet</string> <string formatted="false" name="objectivenotstarted">Zielsetzung %d nicht gestartet</string>
<string formatted="false" name="objectivenotfinished">Zielsetzung %d nicht abgeschlossen</string> <string formatted="false" name="objectivenotfinished">Zielsetzung %d nicht abgeschlossen</string>
<string name="do_not_bolus_record_only">Bolus nur erfassen</string>
<string name="bolusrecordedonly">Bolus wird nur erfasst</string>
</resources> </resources>

View file

@ -744,7 +744,7 @@
<string name="bolusrecordedonly">El Bolo solo será anotado</string> <string name="bolusrecordedonly">El Bolo solo será anotado</string>
<string name="category">Categoría</string> <string name="category">Categoría</string>
<string name="subcategory">Subcategoría</string> <string name="subcategory">Subcategoría</string>
<string name="don_t_bolus_record_only">No administrar Bolo, solo anotar</string> <string name="do_not_bolus_record_only">No administrar Bolo, solo anotar</string>
<string name="insight_min">min</string> <string name="insight_min">min</string>
<string name="temptargetshort">TT</string> <string name="temptargetshort">TT</string>
<string name="start_activity_tt">Inicio TT Actividad</string> <string name="start_activity_tt">Inicio TT Actividad</string>

View file

@ -835,7 +835,7 @@
<string name="start_activity_tt">Rozpocznij TT Ćwiczenia</string> <string name="start_activity_tt">Rozpocznij TT Ćwiczenia</string>
<string name="start_eating_soon_tt">Rozpocznij TT WkrótcePosiłek</string> <string name="start_eating_soon_tt">Rozpocznij TT WkrótcePosiłek</string>
<string name="temptargetshort">TT</string> <string name="temptargetshort">TT</string>
<string name="don_t_bolus_record_only">Nie podawaj bolusa, tylko zapisz rekord</string> <string name="do_not_bolus_record_only">Nie podawaj bolusa, tylko zapisz rekord</string>
<string name="category">Kategoria</string> <string name="category">Kategoria</string>
<string name="subcategory">Podkategoria</string> <string name="subcategory">Podkategoria</string>
<string name="bolusrecordedonly">Bolus zostanie tylko zapisany w rekordach</string> <string name="bolusrecordedonly">Bolus zostanie tylko zapisany w rekordach</string>

View file

@ -813,7 +813,7 @@
<string name="g5appnotdetected">Vänligen uppdatera din G5-app till en supportad version</string> <string name="g5appnotdetected">Vänligen uppdatera din G5-app till en supportad version</string>
<string name="start_activity_tt">Starta \"Träning\"</string> <string name="start_activity_tt">Starta \"Träning\"</string>
<string name="start_eating_soon_tt">Starta \"Äta snart\"</string> <string name="start_eating_soon_tt">Starta \"Äta snart\"</string>
<string name="don_t_bolus_record_only">Ge ingen bolus, logga bara</string> <string name="do_not_bolus_record_only">Ge ingen bolus, logga bara</string>
<string name="category">Kategori</string> <string name="category">Kategori</string>
<string name="subcategory">Underkategori</string> <string name="subcategory">Underkategori</string>
<string name="bolusrecordedonly">Bolusen sparas bara i loggboken</string> <string name="bolusrecordedonly">Bolusen sparas bara i loggboken</string>

View file

@ -923,7 +923,7 @@
<string name="start_activity_tt">Start Activity TT</string> <string name="start_activity_tt">Start Activity TT</string>
<string name="start_eating_soon_tt">Start Eating soon TT</string> <string name="start_eating_soon_tt">Start Eating soon TT</string>
<string name="temptargetshort">TT</string> <string name="temptargetshort">TT</string>
<string name="don_t_bolus_record_only">Don\'t bolus, record only</string> <string name="do_not_bolus_record_only">Do not bolus, record only</string>
<string name="category">Category</string> <string name="category">Category</string>
<string name="subcategory">Subcategory</string> <string name="subcategory">Subcategory</string>
<string name="bolusrecordedonly">Bolus will be recorded only</string> <string name="bolusrecordedonly">Bolus will be recorded only</string>