Updated Language Conventions (markdown)

Language-Conventions.md

@@ -1,4 +1,27 @@
-# English
+Help us translating at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
+
+## Respect the following...
+* Sometimes the translations of Enigmail can help: http://sourceforge.net/p/enigmail/source/ci/master/tree/lang/
+* On Transifex, please do not subdivide languages into regions, e.g. don't specify Italian (Italy), instead please only specify Italian. Exception
+* Exceptions:
+  * "zh": Allow "zh" and "zh_TW" on Transifex ( See http://stackoverflow.com/q/7459367 and http://stackoverflow.com/q/4189875 )
+  * "es": Allow "es" and "es_MX" on Transifex (Info by Israel Buitrón: Mexican spanish is very singular, here (in Mexico) some words about cryptography a little bit different, I have met people from southamerica and they use other words to translate to spanish. For example, "key" can be translated to "llave" in latinamerica, but in Mexico, here must be "clave", a send example is "encrypt", "encriptar", "cifrar" (from english, in Latinamerica and in Mexico, respectively))
+  * "pt_BR"
+* certain language codes [sometimes](https://stackoverflow.com/questions/5074769/cyanogenmod-translate-a-project/8470980#8470980) have different names in Android, so there should be identical copies for each of these language locales:
+  * he and iw
+  * id and in
+  * yi and ji
+* for a language+country locale (e.g. zh_HK, es_MX), convert the _ (underscore) to a -r (dash and lowercase R) and add that to the end of values- (e.g. values-zh-rHK, values-es-rMX)
+
+## strings.xml
+* Always surround with quotes to prevent escaping problems: ``<string name="test">"text"</string>``
+* Dont use ``&lt;``, ``&gt;``, ``<``, or ``>`` directly! Use CDATA: ``<string name="user_id_none"><![CDATA[<none>]]></string>``
+
+## Transifex
+* Fresh pull with ``tx pull -af``
+* Problems with tags: https://github.com/open-keychain/open-keychain/issues/1128
+
+# English terminology
 
 ## OpenPGP not PGP/GPG
 OpenPGP is the open standard, PGP is a program developed by Phil Zimmermann, GPG is a program developed primarily by Werner Koch. Wikipedia clearly differentiates between the program and the standard.
@@ -16,14 +39,7 @@ We try to provide a better terminology when we think that the traditional one is
 | Cache password               | Remember password          | Cache is technical language |
 | Keyserver                    | Cloud          | The word keyserver is only used in OpenKeychain's preferences |
 
-# Other languages
+# German terminology
-Help us translating at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
-* Sometimes the translations of Enigmail can help: http://sourceforge.net/p/enigmail/source/ci/master/tree/lang/
-* On Transifex, please do not subdivide languages into regions, e.g. don't specify ``Italian (Italy)``, instead please only specify ``Italian``.
-* Exception Chinese: Put simplified chinese in "zh" (on transifex: ``Chinese``) and traditional chinese in "zh-rTW" (on transifex: ``Chinese (Taiwan``). See http://stackoverflow.com/q/7459367 and http://stackoverflow.com/q/4189875
-* Other exceptions: pt_BR, es_MX
-
-# German
 Im Allgemeinen steht das Verb hier hinten und das Objekt vorne!
 
 | English                      | German | Comment |
@@ -34,27 +50,8 @@ Im Allgemeinen steht das Verb hier hinten und das Objekt vorne!
 | sign                       | signieren             | "unterschreiben" ist mir auch zu lasch |
 | Backup                       | Backup                  | Heutzutage wissen die Leute was ein Backup ist. Das Wort "Sicherung" ist eher verwirrend. |
 
-## OpenPGP terminology (not necessarily used)
+# OpenPGP terminology (not necessarily used)
 * "keyserver" not "key server", [HKP Draft](http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00)
 * "sign" texts and files, but "certify" keys, [RFC4880](http://tools.ietf.org/html/rfc4880)
 * "passphrase" not "pass phrase", [RFC4880](http://tools.ietf.org/html/rfc4880)
 * ASCII "Armor" not "Armour", [RFC4880](http://tools.ietf.org/html/rfc4880)
-
-## strings.xml
-* Always surround with quotes to prevent escaping problems: ``<string name="test">"text"</string>``
-* Dont use ``&lt;``, ``&gt;``, ``<``, or ``>`` directly! Use CDATA: ``<string name="user_id_none"><![CDATA[<none>]]></string>``
-
-## Transifex
-* Fresh pull with ``tx pull -af``
-* Problems with tags: https://github.com/open-keychain/open-keychain/issues/1128
-
-## Language Considerations
-* On Transifex, please do not subdivide languages into regions, e.g. don't specify Italian (Italy), instead please only specify Italian. Exception
-* Exceptions:
-  * "zh": Allow "zh" and "zh_TW" on Transifex ( See http://stackoverflow.com/q/7459367 and http://stackoverflow.com/q/4189875 )
-  * "es": Allow "es" and "es_MX" on Transifex (Info by Israel Buitrón: Mexican spanish is very singular, here (in Mexico) some words about cryptography a little bit different, I have met people from southamerica and they use other words to translate to spanish. For example, "key" can be translated to "llave" in latinamerica, but in Mexico, here must be "clave", a send example is "encrypt", "encriptar", "cifrar" (from english, in Latinamerica and in Mexico, respectively))
-* certain language codes [sometimes](https://stackoverflow.com/questions/5074769/cyanogenmod-translate-a-project/8470980#8470980) have different names in Android, so there should be identical copies for each of these language locales:
-  * he and iw
-  * id and in
-  * yi and ji
-* for a language+country locale (e.g. zh_HK, es_MX), convert the _ (underscore) to a -r (dash and lowercase R) and add that to the end of values- (e.g. values-zh-rHK, values-es-rMX)