mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-22 07:28:16 +01:00
Give each variant a name, and include in About alert.
I modified existing translated strings, adding the new clause. Not doing that would cause the existing strings to be stripped because they'd no longer have the matching set of format specifiers.
This commit is contained in:
Eric House
parent
f072736bb8
commit
837ff1f8fc
12 changed files with 17 additions and 17 deletions
|
|
@ -79,6 +79,7 @@ android {
|
|||
resValue "string", "nbs_port", "3344"
|
||||
buildConfigField "boolean", "WIDIR_ENABLED", "false"
|
||||
buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false"
|
||||
buildConfigField "String", "VARIANT_NAME", "\"Google Play Store\""
|
||||
}
|
||||
|
||||
xw4fdroid {
|
||||
|
|
@ -89,6 +90,7 @@ android {
|
|||
resValue "string", "nbs_port", "3344"
|
||||
buildConfigField "boolean", "WIDIR_ENABLED", "false"
|
||||
buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false"
|
||||
buildConfigField "String", "VARIANT_NAME", "\"F-Droid\""
|
||||
}
|
||||
xw4d {
|
||||
dimension "variant"
|
||||
|
|
@ -98,6 +100,7 @@ android {
|
|||
resValue "string", "nbs_port", "3345"
|
||||
buildConfigField "boolean", "WIDIR_ENABLED", "true"
|
||||
buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true"
|
||||
buildConfigField "String", "VARIANT_NAME", "\"Dev/Debug\""
|
||||
}
|
||||
|
||||
// WARNING: "all" breaks things. Seems to be a keyword. Need
|
||||
|
|
|
|||
|
|
@ -56,8 +56,10 @@ public class AboutAlert extends XWDialogFragment {
|
|||
String dateString
|
||||
= df.format( new Date( BuildConfig.BUILD_STAMP * 1000 ) );
|
||||
vers.setText( getString( R.string.about_vers_fmt,
|
||||
BuildConfig.VARIANT_NAME,
|
||||
BuildConfig.VERSION_NAME,
|
||||
BuildConfig.GIT_REV, dateString ) );
|
||||
BuildConfig.GIT_REV,
|
||||
dateString ) );
|
||||
|
||||
TextView xlator = (TextView)view.findViewById( R.id.about_xlator );
|
||||
String str = getString( R.string.xlator );
|
||||
|
|
|
|||
|
|
@ -1702,8 +1702,8 @@
|
|||
###########################################################
|
||||
-->
|
||||
<!-- String giving version info, which is substituted in. -->
|
||||
<string name="about_vers_fmt">CrossWords for Android, Version %1$s,
|
||||
rev %2$s, built on %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords for Android, %1$s variant, Version %2$s,
|
||||
rev %3$s, built on %4$s.</string>
|
||||
<!-- copyright info -->
|
||||
<string name="about_copyright">Copyright (C) 1998-2018 by Eric
|
||||
House. This free/open source software is released under the GNU Public
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@ que connecti via el repetidor.</string>
|
|||
Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
|
||||
canviar-lo després a la secció «Partida nova predeterminada» de la configuració.)</string>
|
||||
|
||||
<string name="about_vers_fmt">CrossWords per a l\'Android, versió %1$s, rev %2$s, construït en %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords per a l\'Android, %1$s variant, versió %2$s, rev %3$s, construït en %4$s.</string>
|
||||
<string name="about_credits">Icones de la barra d\'eines per Sarah Chu. Icones Navbar del Noun Project: «archive» per Trendy; «rematch» per Becris i «swap» per iconomania.</string>
|
||||
|
||||
<string name="changes_title">Canvis recents</string>
|
||||
|
|
|
|||
|
|
@ -145,8 +145,6 @@
|
|||
<string name="gameOver">Hra skončena</string>
|
||||
<!-- <string name="moves_fmt">Bylo zahráno %1$d tahů</string> -->
|
||||
<!-- about dialog stuff -->
|
||||
<string name="about_vers_fmt">CrossWords pro Android, Verze %1$s,
|
||||
revize %2$s.</string>
|
||||
<string name="about_copyright">Copyright (C) 1998-2012 Eric
|
||||
House. Tento software je vydán pod licencí GNU Public License.</string>
|
||||
<string name="about_web">Manuál a zdrojové kódy najdete na:
|
||||
|
|
|
|||
|
|
@ -1177,7 +1177,7 @@
|
|||
|
||||
<string name="not_again_newfrom">Eine neue Partie erzeugen, die bereit zum Spielen ist, mit allen Einstellungen aus dieser Partie. Das heißt, diese Partie als Vorlage verwenden.</string>
|
||||
|
||||
<string name="about_vers_fmt">CrossWords für Android, Version %1$s, Rev. %2$s, Build-Datum %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords für Android, %1$s Variant, Version %2$s, Rev. %3$s, Build-Datum %4$s.</string>
|
||||
<string name="bt_pick_addall_button">Alle gepaarten hinzufügen</string>
|
||||
<string name="bt_pair_settings">Weitere paaren</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -2075,8 +2075,8 @@ modèle.</string>
|
|||
<!-- String giving version info, which is substituted in. -->
|
||||
<!--<string name="about_vers_fmt">CrossWords for Android, Version %1$s,
|
||||
rev %2$s, built on %3$s.</string>-->
|
||||
<string name="about_vers_fmt">CrossWords pour Android, version %1$s,
|
||||
rév. %2$s, compilé le %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords pour Android, %1$s variant, version %2$s,
|
||||
rév. %3$s, compilé le %4$s.</string>
|
||||
<!-- copyright info -->
|
||||
<!--<string name="about_copyright">Copyright (C) 1998-2015 by Eric
|
||||
House. This free/open source software is released under the GNU Public
|
||||
|
|
|
|||
|
|
@ -574,7 +574,7 @@
|
|||
<string name="default_name_title">デフォルト プレイヤー名</string>
|
||||
<string name="default_name_message">ここに名前を入力してください。これは新しいゲームを作成するときに使用されます。(後で、設定のセクション \"新しいゲームのデフォルト\" で変更できます)</string>
|
||||
|
||||
<string name="about_vers_fmt">Android 用クロスワード, バージョン %1$s, リビジョン %2$s, ビルド %3$s.</string>
|
||||
<string name="about_vers_fmt">Android 用クロスワード, %1$s variant, バージョン %2$s, リビジョン %3$s, ビルド %4$s.</string>
|
||||
<string name="about_copyright">Copyright (C) 1998-2016 by Eric House. このフリー/オープンソース ソフトウェアは the GNU Public License に基づいてリリースされています.</string>
|
||||
|
||||
<string name="about_web">マニュアルまたはソースコードは: http://xwords.sf.net/android.php を参照してください。バグの報告、機能の提案、支援の提供などは、メールしてください: xwords@eehouse.org 。</string>
|
||||
|
|
|
|||
|
|
@ -827,7 +827,7 @@
|
|||
|
||||
<string name="ids_endnow">Er du sikker på at du ønsker å gi deg?</string>
|
||||
|
||||
<string name="about_vers_fmt">CrossWords for Android, versjon %1$s, rev %2$s, bygd den %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords for Android, %1$s variant, versjon %2$s, rev %3$s, bygd den %4$s.</string>
|
||||
<string name="about_copyright">Kopirett © 1998-2018 Eric House. Denne frie programvaren er lisensiert med GNU Public-lisens.</string>
|
||||
|
||||
<string name="about_web">For manual eller kildekode, se: http://xwords.sf.net/android.php For å innrapportere feil, foreslå funksjoner, tilby hjelp, osv., send e-post til: xwords@eehouse.org</string>
|
||||
|
|
|
|||
|
|
@ -366,7 +366,7 @@
|
|||
<string name="not_again_newfrom">Maak een nieuw spel, klaar om te spelen, met alle instellingen van dit spel. Dat wil zeggen, gebruik dit spel als een template.</string>
|
||||
<string name="default_name_title">Welkom</string>
|
||||
<string name="default_name_message">Bedankt voor het installeren van CrossWords!\n\nVul je naam hieronder in. Het wordt gebruikt als je een nieuw spel maakt. (Je kan dit later wijzigen onder \"Standaardinstellingen nieuw spel\" in Instellingen.)</string>
|
||||
<string name="about_vers_fmt">CrossWords voor Android, Versio %1$s, revisie %2$s, gebouwd op %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords voor Android, %1$s variant, Versio %2$s, revisie %3$s, gebouwd op %4$s.</string>
|
||||
<string name="about_copyright">Copyright (C) 1998-2015 Eric House. Dit is vrije/open source software uitgebracht onder de GNU Public License.</string>
|
||||
<string name="about_web">Voor een handleiding of de broncode kijk op http://xwords.sf.net/android.php. Om bugs te rapporteren, functies aan te vragen, hulp aan te bieden, etc., stuur een mail naar xwords@eehouse.org.</string>
|
||||
<string name="xlator">[leeg]</string>
|
||||
|
|
|
|||
|
|
@ -1452,8 +1452,8 @@
|
|||
###########################################################
|
||||
-->
|
||||
<!-- String giving version info, which is substituted in. -->
|
||||
<string name="about_vers_fmt">CrossWords para Android, Versão %1$s,
|
||||
rev %2$s, built on %3$s.</string>
|
||||
<string name="about_vers_fmt">CrossWords para Android, %1$s Variant, Versão %2$s,
|
||||
rev %3$s, built on %4$s.</string>
|
||||
<!-- copyright info -->
|
||||
<string name="about_copyright">Copyright (C) 1998-2013 por Eric
|
||||
House. Esse software livre/aberto é liberado sob a Licença
|
||||
|
|
|
|||
|
|
@ -107,9 +107,6 @@
|
|||
# Dialog giving copyright and other basic info about # the app
|
||||
###########################################################
|
||||
-->
|
||||
<!-- String giving version info, which is substituted in. -->
|
||||
<string name="about_vers_fmt">XLATE ME: CrossWords for Android, Version %1$s,
|
||||
rev %2$s, built on %3$s.</string>
|
||||
<!-- Welcome dialog text -->
|
||||
<string name="default_name_message">XLATE ME: Thanks for installing
|
||||
CrossWords!\n\nFeel free to enter your name here. It will be used
|
||||
|
|
|
|||
Loading…
Reference in a new issue