spelling fixes

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java

@@ -70,7 +70,7 @@ public final class Constants {
     public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_SECRET = ".sec.pgp";
     public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_PUBLIC = ".pub.pgp";
 
-    // used by QR Codes (Guardian Project, Monkeysphere compatiblity)
+    // used by QR Codes (Guardian Project, Monkeysphere compatibility)
     public static final String FINGERPRINT_SCHEME = "openpgp4fpr";
 
     public static final String BOUNCY_CASTLE_PROVIDER_NAME = BouncyCastleProvider.PROVIDER_NAME;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java

@@ -165,7 +165,7 @@ public class KeychainApplication extends Application {
     }
 
     /**
-     * Restart consolidate process if it has been interruped before
+     * Restart consolidate process if it has been interrupted before
      */
     public boolean checkConsolidateRecovery() {
         if (Preferences.getPreferences(this).getCachedConsolidate()) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java

@@ -25,7 +25,7 @@ import android.os.Handler;
  * 
  * http://code.google.com/p/android/issues/detail?id=41901
  * 
- * DialogFragment disappears on pressing home and comming back. This also happens especially in
+ * DialogFragment disappears on pressing home and coming back. This also happens especially in
  * FileDialogFragment after launching a file manager and coming back.
  * 
  * Usage: <code>

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/DnsResource.java

@@ -93,7 +93,7 @@ public class DnsResource extends LinkedTokenResource {
         // There may be a query part
         /*
         if (pieces.length > 1) {
-            // parse CLASS and TYPE query paramters
+            // parse CLASS and TYPE query parameters
         }
         */
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java

@@ -195,7 +195,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
 
     private static class EncryptStreamResult {
 
-        // this is non-null iff an error occured, return directly
+        // this is non-null iff an error occurred, return directly
         DecryptVerifyResult errorResult;
 
         // for verification

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java

@@ -29,8 +29,8 @@ import java.util.List;
 
 /**
  * This parcel stores the input of one or more PgpSignEncrypt operations.
- * All operations will use the same general paramters, differing only in
+ * All operations will use the same general parameters, differing only in
- * input and output. Each input/output set depends on the paramters:
+ * input and output. Each input/output set depends on the parameters:
  * <p/>
  * - Each input uri is individually encrypted/signed
  * - If a byte array is supplied, it is treated as an input before uris are processed

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java

@@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
  * and returns an OperationResult of type S as a result.
  *
  * The input (of type T) is not given directly to the cryptoOperation method,
- * but must be provided by the overriden createOperationInput method to be
+ * but must be provided by the overridden createOperationInput method to be
  * available upon request during execution of the cryptoOperation.
  *
  * After running cryptoOperation, one of the onCryptoOperation*() methods will

OpenKeychain/src/main/res/values-cs/strings.xml

@@ -319,7 +319,7 @@
   <string name="error_integrity_check_failed">selhala kontrola integrity! Data byla pozměněna!</string>
   <string name="error_wrong_passphrase">chybné heslo.</string>
   <string name="error_could_not_extract_private_key">nebylo možné extrahovat privátní klíč</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Musíte mít Android 4.1 abyste mohli používat Androidí NFC Beam technologii!</string>
   <string name="error_nfc_needed">NFC musí být zapnuté!</string>
   <string name="error_beam_needed">Beam musí být zapnutý!</string>

OpenKeychain/src/main/res/values-de/strings.xml

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">Integritätscheck fehlgeschlagen! Die Daten wurden verändert!</string>
   <string name="error_wrong_passphrase">falsches Passwort</string>
   <string name="error_could_not_extract_private_key">Privater Schlüssel konnte nicht extrahiert werden</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Android 4.1 wird benötigt um Androids NFC-Beam nutzen zu können!</string>
   <string name="error_nfc_needed">NFC muss aktiviert sein!</string>
   <string name="error_beam_needed">Beam muss aktiviert sein!</string>

OpenKeychain/src/main/res/values-es-rMX/strings.xml

@@ -220,7 +220,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-es/strings.xml

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">¡ha fallado la comprobación de integridad! ¡Los datos han sido modificados!</string>
   <string name="error_wrong_passphrase">contraseña incorrecta</string>
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">¡Necesita Android 4.1 para usar la característica NFC Beam de Android!</string>
   <string name="error_nfc_needed">¡NFC debe estar habilitado!</string>
   <string name="error_beam_needed">¡Beam debe estar habilitado!</string>

OpenKeychain/src/main/res/values-et/strings.xml

@@ -61,7 +61,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-eu/strings.xml

@@ -338,7 +338,7 @@
   <string name="error_integrity_check_failed">osotasun egiaztapen hutsegitea! Datuak aldatuak izan dira!</string>
   <string name="error_wrong_passphrase">sarhitz okerra</string>
   <string name="error_could_not_extract_private_key">ezin da giltza pribatua atera</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Android 4.1 behar duzu Android-ren NFC Beam ezaugarria erabiltzeko!</string>
   <string name="error_nfc_needed">NFC gaitua izan behar da!</string>
   <string name="error_beam_needed">Beam gaitua izan behar da!</string>

OpenKeychain/src/main/res/values-fa/strings.xml

@@ -171,7 +171,7 @@
   <string name="error_no_signature_key">کلیدی برای امضاء کردن داده نشد</string>
   <string name="error_wrong_passphrase">رمزعبور اشتباه است</string>
   <string name="error_could_not_extract_private_key">نمی‌توان کلید شخصی را خارج کرد</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">امضاء نشده</string>
   <string name="decrypt_result_invalid_signature">امضاء معتبر نیست!</string>

OpenKeychain/src/main/res/values-fi/strings.xml

@@ -188,7 +188,7 @@
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
   <string name="error_wrong_passphrase">väärä salasana</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_encrypted">Salattu</string>
   <string name="decrypt_result_not_encrypted">Ei salattu</string>

OpenKeychain/src/main/res/values-fr/strings.xml

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">la vérification de l\'intégrité a échoué ! Les données ont été modifiées !</string>
   <string name="error_wrong_passphrase">mot de passe erroné</string>
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clé privée</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Il vous faut Android 4.1 pour utiliser la fonction Beam NFC d\'Android !</string>
   <string name="error_nfc_needed">La NFC doit être activée !</string>
   <string name="error_beam_needed">Beam doit être activé !</string>

OpenKeychain/src/main/res/values-hi/strings.xml

@@ -31,7 +31,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-hu/strings.xml

@@ -43,7 +43,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-id/strings.xml

@@ -35,7 +35,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-it/strings.xml

@@ -341,7 +341,7 @@
   <string name="error_integrity_check_failed">Controllo di integrita\' fallito! I dati sono stati modificati!</string>
   <string name="error_wrong_passphrase">Password errata</string>
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Devi avere Android 4.1 per usare Android NFC Beam!</string>
   <string name="error_nfc_needed">NFC deve essere abilitato!</string>
   <string name="error_nothing_import">Nessuna chiave trovata!</string>

OpenKeychain/src/main/res/values-ja/strings.xml

@@ -348,7 +348,7 @@
   <string name="error_integrity_check_failed">完全性チェックが失敗しました! データに変更があります!</string>
   <string name="error_wrong_passphrase">正しくないパスワードです</string>
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1  が必要です!</string>
   <string name="error_nfc_needed">NFCを有効にしてください!</string>
   <string name="error_beam_needed">Beamを有効にしてください!</string>

OpenKeychain/src/main/res/values-kn/strings.xml

@@ -19,7 +19,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-ko/strings.xml

@@ -290,7 +290,7 @@
   <string name="error_integrity_check_failed">무결성 체크 실패! 데이터가 수정되었습니다!</string>
   <string name="error_wrong_passphrase">암호 오류</string>
   <string name="error_could_not_extract_private_key">개인키를 추출할 수 없음</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">NFC 빔 기능을 쓰기 위해선 안드로이드 4.1 이상이 필요합니다!</string>
   <string name="error_nfc_needed">NFC가 활성화 되어 있어야 합니다!</string>
   <string name="error_beam_needed">빔이 활성화 되어 있어야 합니다!</string>

OpenKeychain/src/main/res/values-la/strings.xml

@@ -19,7 +19,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-nb/strings.xml

@@ -278,7 +278,7 @@
   <string name="error_no_signature_key">ingen signaturnøkkel oppgitt</string>
   <string name="error_wrong_passphrase">feil passord</string>
   <string name="error_could_not_extract_private_key">kunne ikke pakke ut privat nøkkel</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Du trenger Android 4.1 for å bruke Androids NFC-strålingsfunksjon!</string>
   <string name="error_nfc_needed">NFC må være påslått!</string>
   <string name="error_beam_needed">Stråling må være påslått!</string>

OpenKeychain/src/main/res/values-nl/strings.xml

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">integriteitcheck niet geslaagd! Data is bewerkt!</string>
   <string name="error_wrong_passphrase">wachtwoord verkeerd</string>
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">U heeft minstens Android 4.1 nodig om Androids NFC Beam eigenschap te gebruiken!</string>
   <string name="error_nfc_needed">NFC moet aangezet zijn!</string>
   <string name="error_beam_needed">Beam moet aangezet zijn!</string>

OpenKeychain/src/main/res/values-pl/strings.xml

@@ -223,7 +223,7 @@
   <string name="error_invalid_data">Brak treści szyfrowanej lub podpisanej OpenPGP!</string>
   <string name="error_integrity_check_failed">Sprawdzanie spójności zakończone niepowodzeniem! Dane były modyfikowane!</string>
   <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 aby korzystać z Android NFC Beam</string>
   <string name="error_nothing_import">Nie znaleziono kluczy!</string>
   <string name="error_contacts_key_id_missing">Pobieranie ID klucza z kontaktów nie powiodło się!</string>

OpenKeychain/src/main/res/values-pt-rBR/strings.xml

@@ -347,7 +347,7 @@
   <string name="error_integrity_check_failed">a verificação de integridade falhou! Os dados foram modificados!</string>
   <string name="error_wrong_passphrase">senha incorreta</string>
   <string name="error_could_not_extract_private_key">não foi possível extrair a chave privada</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Você precisa do Android 4.1 para usar a funcionalidade Android NFC Beam!</string>
   <string name="error_nfc_needed">O NFC precisa estar habilitado!</string>
   <string name="error_beam_needed">O Beam precisa estar habilitado!</string>

OpenKeychain/src/main/res/values-ru/strings.xml

@@ -354,7 +354,7 @@
   <string name="error_integrity_check_failed">Проверка целостности не удалась! Данные изменились!</string>
   <string name="error_wrong_passphrase">неправильный пароль</string>
   <string name="error_could_not_extract_private_key">не удалось извлечь личный ключ</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
   <string name="error_nfc_needed">Необходимо включить NFC!</string>
   <string name="error_beam_needed">Необходимо включить Beam!</string>

OpenKeychain/src/main/res/values-sl/strings.xml

@@ -189,7 +189,7 @@
   <string name="error_invalid_data">Ne najdem nobene vsebine šifrirane ali podpisane z OpenPGP!</string>
   <string name="error_integrity_check_failed">Preverba neokrnjenosti ni bila uspešna! Podatki so bili spremenjeni!</string>
   <string name="error_could_not_extract_private_key">ne morem izvleči zasebnega ključa</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Za uporabo storitve NFC Beam potrebujete najmanj Android 4.1!</string>
   <string name="error_nfc_needed">Vključen mora biti NFC!</string>
   <string name="error_beam_needed">Vključen mora biti Beam!</string>

OpenKeychain/src/main/res/values-sr/strings.xml

@@ -339,7 +339,7 @@
   <string name="error_integrity_check_failed">провера интегритета није успела! Подаци су измењени!</string>
   <string name="error_wrong_passphrase">погрешна лозинка</string>
   <string name="error_could_not_extract_private_key">не могох да извучем лични кључ</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Потребан вам је Андроид 4.1 да бисте користили Андроидову могућност НФЦ Снопа!</string>
   <string name="error_nfc_needed">НФЦ мора бити укључен!</string>
   <string name="error_beam_needed">Бим мора бити укључен</string>

OpenKeychain/src/main/res/values-sv/strings.xml

@@ -320,7 +320,7 @@
   <string name="error_integrity_check_failed">integritetskontroll misslyckades! Data har modifierats!</string>
   <string name="error_wrong_passphrase">fel lösenord</string>
   <string name="error_could_not_extract_private_key">kunde inte extrahera privat nyckel</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Du behöver Android 4.1 för att använda Androids NFC Beam-funktion!</string>
   <string name="error_nfc_needed">NFC måste vara aktiverat!</string>
   <string name="error_beam_needed">Beam måste vara aktiverat!</string>

OpenKeychain/src/main/res/values-tr/strings.xml

@@ -143,7 +143,7 @@
   <string name="error_invalid_data">Geçerli olan şifrelenmiş ya da imzalanmış OpenPGP içeriği yok!</string>
   <string name="error_integrity_check_failed">Bütünlük kontrolü başarısız! Veri değiştirilmiş!</string>
   <string name="error_could_not_extract_private_key">özel anahtar çıkarılamadı</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Android\'in NFC Beam özelliğini kullanabilmek için Android 4.1 kullanmalısınız!</string>
   <string name="error_nothing_import">Anahtar bulunamadı!</string>
   <string name="error_contacts_key_id_missing">Kişilerden anahtar ID getirme işlemi başarısız!</string>

OpenKeychain/src/main/res/values-uk/strings.xml

@@ -147,7 +147,7 @@
   <string name="error_no_signature_key">не подано ключ підпису</string>
   <string name="error_integrity_check_failed">Невдала перевірка цілісності! Дані вже змінено!</string>
   <string name="error_could_not_extract_private_key">не можна витягти секретний ключ</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 для використання функції Androids NFC промінь!</string>
   <string name="error_nothing_import">Ключ не знайдено!</string>
   <string name="error_generic_report_bug">Трапилася загальна помилка, будь ласка, створіть новий звіт про помилку для OpenKeychain.</string>

OpenKeychain/src/main/res/values-vi/strings.xml

@@ -215,7 +215,7 @@
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <!--results shown after decryption/verification-->
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->

OpenKeychain/src/main/res/values-zh-rTW/strings.xml

@@ -288,7 +288,7 @@
   <string name="error_integrity_check_failed">完整性檢查失敗！資料已被修改！</string>
   <string name="error_wrong_passphrase">密碼錯誤</string>
   <string name="error_could_not_extract_private_key">無法抽取私鑰</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">需要Android 4.1以上才能使用NFC Beam功能！</string>
   <string name="error_nfc_needed">NFC 必須開啓 !</string>
   <string name="error_beam_needed">Bean 必須開啓 !</string>

OpenKeychain/src/main/res/values-zh/strings.xml

@@ -344,7 +344,7 @@
   <string name="error_integrity_check_failed">完整性检查失败! 数据已被篡改!</string>
   <string name="error_wrong_passphrase">密码错误</string>
   <string name="error_could_not_extract_private_key">不能提取私钥</string>
-  <!--errors without preceeding Error:-->
+  <!--errors without preceding Error:-->
   <string name="error_jelly_bean_needed">只有 Android 4.1 及以上才支持 Android\'s NFC Beam 功能</string>
   <string name="error_nfc_needed">必须开启 NFC!</string>
   <string name="error_beam_needed">必须开启 Beam!</string>

OpenKeychain/src/main/res/values/strings.xml

@@ -402,7 +402,7 @@
     <string name="error_could_not_extract_private_key">"could not extract private key"</string>
     <string name="error_wrong_security_token">"this security token doesn't contain required key"</string>
 
-    <!-- errors without preceeding Error: -->
+    <!-- errors without preceding Error: -->
     <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string>
     <string name="error_nfc_needed">"NFC must be enabled!"</string>
     <string name="error_beam_needed">"Beam must be enabled!"</string>

README.md

@@ -22,7 +22,7 @@ Translations are managed at Transifex, please contribute there at https://www.tr
 1. Lookout for interesting issues on Github. We have tagged issues were we explicitly like to see contributions: https://github.com/open-keychain/open-keychain/labels/help-wanted
 2. Read this README, especially the notes about coding style
 3. Fork OpenKeychain and contribute code (the best part :sunglasses: )
-4. Open a pull request on Github. We will help with occuring problems and merge your changes back into the main project.
+4. Open a pull request on Github. We will help with occurring problems and merge your changes back into the main project.
 5. PROFIT
 
 ### For bigger changes