diff --git a/.hgignore b/.hgignore new file mode 100644 index 00000000..4a420f3c --- /dev/null +++ b/.hgignore @@ -0,0 +1,7 @@ + +syntax: glob + +# Ignore patterns +.metadata/ +bin/ +gen/ diff --git a/android/project.properties b/android/project.properties index 9575abaf..b6221954 100644 --- a/android/project.properties +++ b/android/project.properties @@ -12,4 +12,4 @@ split.density=false # Project target. target=android-13 apk-configurations= -android.library.reference.1=../JakeWharton-ActionBarSherlock/library +android.library.reference.1=../external/JakeWharton-ActionBarSherlock/library diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml index 1622bc85..bf9d8bb1 100644 --- a/android/res/values-ca/strings.xml +++ b/android/res/values-ca/strings.xml @@ -1,11 +1,11 @@ -Ets nou a Transdroid? Pots trobar ajuda per l'instal·lació a www.transdroid.org/download\n\nPer començar a servir via torrent, entra si us plau les dades el teu servidor: +Ets nou a Transdroid? Pots trobar ajuda per l\'installació a www.transdroid.org/download\n\nPer començar a servir via torrent, entra si us plau les dades el teu servidor: Desa Descarta Servidor torrent -Encara no s'ha configurat cap servidor +Encara no s\'ha configurat cap servidor Mostra-ho tot Sense etiqueta diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 104062ca..fe8a73ca 100755 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -142,7 +142,7 @@ Adresse (S)FTP racine Par exemple ftp://me@server.com/downloads/ Délai de connexion dépassé -Nombre de secondes avant l'expiration d'une tentative de connexion +Nombre de secondes avant l\'expiration d\'une tentative de connexion SSL Sélectionner pour utiliser https Empreinte du certificat SSL diff --git a/external/JakeWharton-ActionBarSherlock/library/bin/com_actionbarsherlock.jar b/external/JakeWharton-ActionBarSherlock/library/bin/com_actionbarsherlock.jar deleted file mode 100644 index 02c7a02f..00000000 Binary files a/external/JakeWharton-ActionBarSherlock/library/bin/com_actionbarsherlock.jar and /dev/null differ diff --git a/lib/.classpath b/lib/.classpath index e7acd261..f2d4ba8a 100644 --- a/lib/.classpath +++ b/lib/.classpath @@ -2,6 +2,6 @@ - +