Project

General

Profile

« Previous | Next » 

Revision afcae97f

Added by Leszek Koltunski almost 2 years ago

Stop giving different app names in different languages.
Remove the licensing info from the About Dialog.

View differences:

src/main/java/org/distorted/dialogs/RubikDialogAbout.java
83 83
    text.setText(getString(R.string.ap_placeholder,appName, getAppVers(act)));
84 84

  
85 85
    MovementMethod mm = LinkMovementMethod.getInstance();
86
    TextView text1 = view.findViewById(R.id.about_section1);
87
    text1.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
88
    text1.setMovementMethod(mm);
89 86
    TextView text2 = view.findViewById(R.id.about_section2);
90 87
    text2.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
91 88
    text2.setMovementMethod(mm);
92 89
    TextView text3 = view.findViewById(R.id.about_section3);
93 90
    text3.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
94
    text3.setMovementMethod(mm);
95 91

  
96 92
    TextView text4 = view.findViewById(R.id.about_section4);
97 93

  
src/main/res/layout/dialog_about.xml
23 23
            android:layout_marginRight="10dp"
24 24
            android:layout_marginBottom="10dp"/>
25 25

  
26
        <TextView
27
            android:id="@+id/about_section1"
28
            android:layout_width="match_parent"
29
            android:layout_height="fill_parent"
30
            android:layout_weight="0.40"
31
            android:layout_marginTop="10dp"
32
            android:layout_marginLeft="10dp"
33
            android:layout_marginRight="10dp"
34
            android:layout_marginBottom="10dp"
35
            android:text="@string/credits1"/>
36

  
37 26
        <TextView
38 27
            android:id="@+id/about_section2"
39 28
            android:layout_width="match_parent"
src/main/res/values-de/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">Magic Cube</string>
3 2
    <string name="scramble">Verdrehen</string>
4 3
    <string name="solve">Lösen</string>
5 4
    <string name="exit">Beenden</string>
......
68 67

  
69 68
    <string name="credits1">Open Source App, die mit der Distorted Graphics Library entwickelt wurde. Lizenziert unter <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL Version 2</a> oder wie gewünscht einer späteren Version.</string>
70 69
    <string name="credits2">Hübsche Muster von Walter Randelshofer. Sehen Sie <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">Laden Sie den Code herunter, sehen Sie sich Tutorials an, lernen Sie, wie Sie Ihren eigenen Grafikeffekt hinzufügen, wie Sie Ihr eigenes Objekt codieren, ein hübsches Muster beisteuern, Ihren eigenen Löser implementieren oder einen Fehler melden: <a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">Rubik und Rubik Cube sind eingetragene Warenzeichen. Wir sind damit nicht verbunden.</string>
73 71

  
74 72
    <string name="solver_generic_error1">Löser für dieses Objekt und diese Größe noch nicht implementiert!</string>
75 73

  
src/main/res/values-es/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">Cubo mágico</string>
3 2
    <string name="scramble">Revolver</string>
4 3
    <string name="solve">Resolver</string>
5 4
    <string name="exit">Salir</string>
......
68 67

  
69 68
    <string name="credits1">Aplicación de código abierto desarrollada con la biblioteca de gráficos de Distorted. Con licencia <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL versión 2</a> o, a tu elección, cualquier versión posterior.</string>
70 69
    <string name="credits2">Pretty Patterns por Walter Randelshofer. Mira <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">Descarga código, echa un vistazo a los tutoriales, aprende a añadir tu propio efecto gráfico, aprende a programar tu propio objeto, contribuye con un patrón hermoso, implementa tu propio solucionador o informa un error: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">Rubik y Rubik Cube son marcas registradas. No estamos afiliados a ella.</string>
73 71

  
74 72
    <string name="solver_generic_error1">¡Aún no se implementado el solucionador para este objeto y tamaño!</string>
75 73

  
src/main/res/values-fr/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">Cube magique</string>
3 2
    <string name="scramble">Brouiller</string>
4 3
    <string name="solve">Résoudre</string>
5 4
    <string name="exit">Sortir</string>
......
68 67

  
69 68
    <string name="credits1">Appli Open Source développée à l\'aide de la bibliothèque graphique Distorted. Sous licence <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL version 2</a> ou - à votre choix - toute version ultérieure.</string>
70 69
    <string name="credits2">Pretty Patterns par Walter Randelshofer. Voir <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">Téléchargez le code, consultez les tutoriels, apprenez comment ajouter votre propre effet graphique, apprenez à coder votre propre objet, contribuez à un joli modèle, mettez en oeuvre votre propre solutionneur ou signalez un bogue : \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">Rubik et Rubik Cube sont des marques déposées. Nous n\'y sommes pas affiliés.</string>
73 71

  
74 72
    <string name="solver_generic_error1">Solutionneur pour cet objet et cette taille non encore mis en place !</string>
75 73

  
src/main/res/values-ja/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">Magic Cube</string>
3 2
    <string name="scramble">スクランブル</string>
4 3
    <string name="solve">解く</string>
5 4
    <string name="exit">中止</string>
......
68 67

  
69 68
    <string name="credits1">ディストートグラフィックのライブラリを使用して開発されたオープンソースアプリ。<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL バージョン 2</a>でライセンスされているか、または-オプション-それ以降のすべてのバージョン。</string>
70 69
    <string name="credits2">Pretty Patterns 沿って Walter Randelshofer. 見る <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">コードのダウンロード、チュートリアルの確認、独自のグラフィック効果の追加方法、独自のオブジェクトのコーディング方法、プリティパターンの提出、独自のソルバーの実装、またはバグの報告などについて知る。\n\n <a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">ルービックキューブおよびルービックキューブは登録商標です。 私たちはそれと提携していません。</string>
73 71

  
74 72
    <string name="solver_generic_error1">このオブジェクトとサイズのソルバーはまだ実装されていません!</string>
75 73

  
src/main/res/values-ko/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">매직 큐브</string>
3 2
    <string name="scramble">뒤섞기</string>
4 3
    <string name="solve">해답</string>
5 4
    <string name="exit">종료</string>
......
68 67

  
69 68
    <string name="credits1">왜곡된 그래픽 라이브러리를 사용하여 개발된 오픈 소스 앱. <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL 버전 2</a> 또는 귀하의 선택에 따라 최신 버전으로 라이센스가 부여됩니다.</string>
70 69
    <string name="credits2">Pretty Patterns 으로 Walter Randelshofer. 보다 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">코드를 다운로드하고, 튜토리얼을보고, 자신만의 그래픽 효과를 추가하는 방법을 배우고, 자신의 개체를 코딩하는 방법을 배우며, 예쁜 패턴을 기여하고, 자신만의 해결사를 구현하거나, 버그를 신고하십시오:\n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">Rubik 및 Rubik Cube는 등록 상표입니다. 우리는 그것과 제휴하지 않습니다.</string>
73 71

  
74 72
    <string name="solver_generic_error1">아직 구현되지 않은 이 개체 및 크기에 대한 해결사!</string>
75 73

  
src/main/res/values-pl/strings.xml
1 1
<resources>
2
    <string name="app_name">Kostka Rubika</string>
3 2
    <string name="scramble">Pomieszaj</string>
4 3
    <string name="solve">Rozwiąż</string>
5 4
    <string name="exit">Wyjdź</string>
......
68 67

  
69 68
    <string name="credits1">Aplikacja open-source napisana wykorzystując bibliotekę Distorted. Licencja: <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL wersja 2</a> albo jakakolwiek poźniejsza.</string>
70 69
    <string name="credits2">Piękne Wzory Waltera Randelshofera. Zobacz <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">Ściągnij kod, rzuć okiem na tutoriale, naucz się napisać swój własny efekt graficzny, dodaj własny obiekt, wymyśl Piekny Wzór, zaimplementuj Rozwiązywacz, albo zgłoś błąd: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a></string>
70
    <string name="credits3">Rubik i RubikCube to zarejestrowane znaki towarowe. Nie jesteśmy z nimi powiązani.</string>
72 71

  
73 72
    <string name="solver_generic_error1">Rozwiązywacz takiego obiektu jest jeszcze nie zaimplementowany!</string>
74 73

  
src/main/res/values-ru/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">Волшебный куб</string>
3 2
    <string name="scramble">Скрамбл</string>
4 3
    <string name="solve">Решить</string>
5 4
    <string name="exit">Выход</string>
......
68 67

  
69 68
    <string name="credits1">Приложение с открытым исходным кодом, разработанное с использованием библиотеки графики Искажений. Лицензируется согласно <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">версии 2 GPL</a> или любой более поздней версии по вашему выбору.</string>
70 69
    <string name="credits2">Pretty Patterns по Walter Randelshofer. Смотри <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">Загрузите код, посмотрите учебные пособия, узнайте, как добавить собственный графический эффект, научитесь кодировать собственный объект, добавьте Симпатичный узор, внедрите собственный решебник или сообщите об ошибке: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">Рубик и Кубик Рубика являются зарегистрированными товарными знаками. Мы не связаны с этим.</string>
73 71

  
74 72
    <string name="solver_generic_error1">Решебника для этого объекта и размера еще нет!</string>
75 73

  
src/main/res/values-zh-rCN/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">MagicCube</string>
3 2
    <string name="scramble">搅混</string>
4 3
    <string name="solve">解决</string>
5 4
    <string name="exit">退出</string>
......
68 67

  
69 68
    <string name="credits1">此应用程式原始码开发使用Distorted图型库。根据<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">通用公共许可版本2</a>或者任何更新版本(根据您的选择)进行许可。</string>
70 69
    <string name="credits2">Pretty Patterns by Werner Randelshofer. 請看 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">下载代码,浏览教程,学习如何添加自己的图形效果,学习如何编写自己的专案,创造美丽图案,实现自己的求解器,或者报告错误:<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">魔方和魔方是注册商标。 我们不隶属于它。</string>
73 71
    <string name="credits4">请参阅我们的<a href="https://distorted.org/redmine/projects/magic-cube/wiki/%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96">隐私政策</a></string>
74 72

  
75 73
    <string name="privacy_policy">隐私政策</string>
src/main/res/values-zh-rTW/strings.xml
1 1
<?xml version="1.0" encoding="UTF-8"?><resources>
2
    <string name="app_name">魔術方塊</string>
3 2
    <string name="scramble">攪混</string>
4 3
    <string name="solve">解决</string>
5 4
    <string name="exit">退出</string>
......
68 67

  
69 68
    <string name="credits1">此應用程式原始碼開發使用Distorted圖型庫。根據<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">通用公共許可版本2</a>或者任何更新版本(根據您的選擇)進行許可。</string>
70 69
    <string name="credits2">Pretty Patterns by Werner Randelshofer. 請看 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
71
    <string name="credits3">下載代碼,瀏覽教程,學習如何添加自己的圖形效果,學習如何编寫自己的專案,創造美麗圖案,實现自己的求解器,或者報告錯誤:\n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
72
  </string>
70
    <string name="credits3">魔方和魔方是註冊商標。 我們不隸屬於它。</string>
73 71

  
74 72
    <string name="solver_generic_error1">此對象和尺寸的求解器尚未實現!</string>
75 73

  
src/main/res/values/strings.xml
1 1
<resources>
2
    <string name="app_name">Magic Cube</string>
2
    <string name="app_name" translatable="false">Magic Cube</string>
3 3
    <string name="distorted" translatable="false">DISTORTED</string>
4 4
    <string name="scramble">Scramble</string>
5 5
    <string name="solve">Solve</string>
......
60 60

  
61 61
    <string name="credits1">Open Source app developed using the Distorted graphics library. Licensed under <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL version 2</a> or - at your option - any later version.</string>
62 62
    <string name="credits2">Pretty Patterns by Walter Randelshofer. See <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
63
    <string name="credits3">Download code, take a look at tutorials, learn how to add your own graphics effect, learn how to code your own object, contribute a Pretty Pattern, implement your own solver, or report a bug: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a></string>
63
    <string name="credits3">Rubik and Rubik Cube are registered trademarks. We are not affiliated with it.</string>
64 64
    <string name="credits4" translatable="false">Please see our <a href="https://distorted.org/redmine/projects/magic-cube/wiki/Privacy_policy">Privacy Policy</a></string>
65 65

  
66 66
    <string name="privacy_policy" translatable="false">Privacy Policy</string>

Also available in: Unified diff