Skip to content

Commit 0a22f39

Browse files
tibbitibbi
committed
lets reuse some strings from Commons
1 parent 21b134c commit 0a22f39

File tree

17 files changed

+20
-552
lines changed

17 files changed

+20
-552
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
compile 'com.simplemobiletools:commons:2.9.8'
35+
compile 'com.simplemobiletools:commons:2.9.9'
3636
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
3737
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3838
}

‎app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: List<FileDirItem>,
126126
val shareTitle = activity.resources.getString(R.string.share_via)
127127
Intent().apply {
128128
action = Intent.ACTION_SEND_MULTIPLE
129-
putExtra(Intent.EXTRA_SUBJECT, activity.resources.getString(R.string.shared_files))
130129
putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris)
131130
type = "*/*"
132131
activity.startActivity(Intent.createChooser(this, shareTitle))

‎app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val c
3737
.setPositiveButton(R.string.ok, null)
3838
.setNegativeButton(R.string.cancel, null)
3939
.create().apply {
40-
activity.setupDialogStuff(view, this, R.string.copy_items)
40+
activity.setupDialogStuff(view, this, R.string.copy_move)
4141
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener({
4242
if (destinationPath == context.resources.getString(R.string.select_destination) || destinationPath.isEmpty()) {
4343
context.toast(R.string.please_select_destination)
@@ -58,7 +58,7 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val c
5858
if (files.size == 1) {
5959
val newFile = File(files[0].path)
6060
if (File(destinationPath, newFile.name).exists()) {
61-
context.toast(R.string.already_exists)
61+
context.toast(R.string.name_taken)
6262
return@setOnClickListener
6363
}
6464
}

‎app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CreateNewItemDialog(val activity: Activity, val path: String, val callback
6262
}
6363

6464
private fun errorOccurred() {
65-
activity.toast(R.string.error_occurred)
65+
activity.toast(R.string.unknown_error_occurred)
6666
}
6767

6868
private fun createFile(file: File, alertDialog: AlertDialog): Boolean {

‎app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/RenameItemDialog.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RenameItemDialog(val activity: Activity, val item: FileDirItem, val callba
2222
.setPositiveButton(R.string.ok, null)
2323
.setNegativeButton(R.string.cancel, null)
2424
.create().apply {
25-
activity.setupDialogStuff(view, this, R.string.rename_item)
25+
activity.setupDialogStuff(view, this, R.string.rename)
2626
window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
2727
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener({
2828
val newName = view.item_name.value
@@ -50,7 +50,7 @@ class RenameItemDialog(val activity: Activity, val item: FileDirItem, val callba
5050
sendSuccess(newFile)
5151
dismiss()
5252
} else {
53-
context.toast(R.string.error_occurred)
53+
context.toast(R.string.unknown_error_occurred)
5454
}
5555
}
5656
})

‎app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
191191
}
192192

193193
override fun prepareForDeleting(paths: ArrayList<String>) {
194-
activity.toast(R.string.deleting)
195194
mToBeDeleted = paths
196195
val deletedCnt = mToBeDeleted.size
197196

@@ -203,14 +202,14 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
203202

204203
private fun notifyDeletion(cnt: Int) {
205204
val res = resources
206-
val msg = res.getQuantityString(R.plurals.items_deleted, cnt, cnt)
205+
/*val msg = res.getQuantityString(R.plurals.items_deleted, cnt, cnt)
207206
mSnackbar = Snackbar.make(items_holder, msg, Snackbar.LENGTH_INDEFINITE)
208207
mSnackbar!!.apply {
209208
setAction(res.getString(R.string.undo), undoDeletion)
210209
setActionTextColor(Color.WHITE)
211210
show()
212211
}
213-
fillItems()
212+
fillItems()*/
214213
}
215214

216215
fun checkDelete() {

‎app/src/main/res/layout/dialog_create_new.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:layout_height="wrap_content"
3030
android:layout_marginBottom="@dimen/medium_margin"
3131
android:checked="true"
32-
android:text="@string/directory"/>
32+
android:text="@string/folder"/>
3333

3434
<com.simplemobiletools.commons.views.MyCompatRadioButton
3535
android:id="@+id/dialog_radio_file"

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,19 @@
22
<resources>
33
<string name="app_name">Schlichter Dateimanager</string>
44
<string name="app_launcher_name">Dateimanager</string>
5-
<string name="share_via">Teilen per</string>
6-
<string name="no_permissions">Wir benötigen die Berechtigung, auf deinen Speicher zuzugreifen</string>
7-
<string name="no_app_found">Keine App zum Öffnen dieses Dateityps vorhanden</string>
8-
<string name="create_new">Neue Datei erstellen</string>
9-
<string name="rename_item">Rename item</string>
10-
<string name="directory">Ordner</string>
11-
<string name="file">Datei</string>
12-
<string name="name_taken">Es existiert bereits eine Datei oder ein Ordner mit diesem Namen</string>
13-
<string name="invalid_name">Der Name enthält nicht erlaubte Zeichen</string>
14-
<string name="empty_name">Please enter a name</string>
15-
<string name="error_occurred">Ein unbekannter Fehler ist aufgetreten</string>
16-
<string name="delete">Löschen</string>
17-
<string name="deleting">Lösche</string>
18-
<string name="undo">Rückgängig</string>
19-
<string name="rename">Umbenennen</string>
20-
<string name="properties">Eigenschaften</string>
21-
<string name="copy">Kopieren</string>
22-
<string name="copy_move">Kopieren/Verschieben</string>
23-
<string name="share">Teilen</string>
24-
<string name="shared_files">Durch Simple File Manager geteilte Dateien</string>
25-
<string name="no_files_selected">Keine Dateien ausgewählt</string>
26-
<string name="copy_item">Datei/Ordner kopieren</string>
27-
<string name="copy_items">Dateien/Ordner kopieren</string>
28-
<string name="move">Verschieben</string>
29-
<string name="source">Quelle</string>
30-
<string name="destination">Ziel</string>
31-
<string name="select_destination">Ziel auswählen</string>
32-
<string name="invalid_destination">Konnte nicht an ausgewähltes Ziel schreiben</string>
33-
<string name="please_select_destination">Bitte wähle ein Ziel</string>
34-
<string name="source_and_destination_same">Source and destination cannot be the same</string>
35-
<string name="copying">Kopiere</string>
36-
<string name="copying_success">Files copied successfully</string>
37-
<string name="copy_move_failed">Konnte die Datei nicht kopieren</string>
38-
<string name="moving">Moving</string>
39-
<string name="moving_success">Files moved successfully</string>
40-
<string name="already_exists">A file with that name already exists</string>
41-
<string name="ok">OK</string>
42-
<string name="cancel">Abbrechen</string>
435
<string name="press_back_again">Drücke erneut zum Schließen</string>
44-
<string name="moving_success_partial">Some files could not be moved</string>
45-
<string name="copying_success_partial">Some files could not be copied</string>
46-
47-
<plurals name="items_deleted">
48-
<item quantity="one">1 Datei/Ordner gelöscht</item>
49-
<item quantity="other">%1$d Dateien/Ordner gelöscht</item>
50-
</plurals>
51-
52-
<plurals name="items">
53-
<item quantity="one">1 Datei/Ordner</item>
54-
<item quantity="other">%1$d Dateien/Ordner</item>
55-
</plurals>
6+
<string name="no_app_found">No app for opening this type of file is available</string>
567

578
<!-- Favorites -->
589
<string name="favorites">Favorites</string>
5910
<string name="add_to_favorites">Add to favorites</string>
6011
<string name="remove_from_favorites">Remove from favorites</string>
6112

62-
<!-- Settings -->
63-
<string name="show_hidden">Zeige versteckte Dateien und Ordner</string>
64-
6513
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
6614
<!-- Short description has to have less than 80 chars -->
6715
<string name="app_short_description">A simple file manager for browsing and editing files and directories.</string>
6816
<string name="app_long_description">
69-
Can also be used for browsing root files and SDcard content. You can easily renamem copy, move, delete and share anything you wish.
70-
17+
Can also be used for browsing root files and SDcard content. You can easily rename, copy, move, delete and share anything you wish.
7118

7219
Contains no ads or unnecessary permissions. It is fully opensource, provides a Dark theme too.
7320

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,20 @@
22
<resources>
33
<string name="app_name">Simple File Manager</string>
44
<string name="app_launcher_name">Administrador de archivos</string>
5-
<string name="share_via">Compartir vía</string>
6-
<string name="no_permissions">Se necesita permiso para acceder al almacenamiento</string>
7-
<string name="no_app_found">No hay disponible ninguna aplicación para abrir este tipo de archivos</string>
8-
<string name="create_new">Crear nuevo elemento</string>
9-
<string name="rename_item">Renombrar elemento</string>
10-
<string name="directory">Carpeta</string>
11-
<string name="file">Archivo</string>
12-
<string name="name_taken">Ya existe un archivo o carpeta con ese nombre</string>
13-
<string name="invalid_name">El nombre contiene caracteres inválidos</string>
14-
<string name="empty_name">Por favor, introduzca un nombre</string>
15-
<string name="error_occurred">Se ha producido un error inesperado</string>
16-
<string name="delete">Eliminar</string>
17-
<string name="deleting">Eliminando</string>
18-
<string name="undo">Deshacer</string>
19-
<string name="rename">Renombrar</string>
20-
<string name="properties">Propiedades</string>
21-
<string name="copy">Copiar</string>
22-
<string name="copy_move">Copiar/Mover</string>
23-
<string name="share">Compartir</string>
24-
<string name="shared_files">Archivos compartidos vía Simple File Manager</string>
25-
<string name="no_files_selected">No hay archivos seleccionados</string>
26-
<string name="copy_item">Copiar elemento</string>
27-
<string name="copy_items">Copiar elementos</string>
28-
<string name="move">Mover</string>
29-
<string name="source">Origen</string>
30-
<string name="destination">Destino</string>
31-
<string name="select_destination">Seleccione destino</string>
32-
<string name="invalid_destination">No se puede escribir en el destino seleccionado</string>
33-
<string name="please_select_destination">Por favor, seleccione un destino</string>
34-
<string name="source_and_destination_same">Origen y destino no pueden coincidir</string>
35-
<string name="copying">Copiando</string>
36-
<string name="copying_success">Archivos copiados exitosamente</string>
37-
<string name="copy_move_failed">Se ha producido un error</string>
38-
<string name="moving">Moviendo</string>
39-
<string name="moving_success">Archivos movidos exitosamente</string>
40-
<string name="already_exists">Ya existe un archivo con ese nombre</string>
41-
<string name="ok">OK</string>
42-
<string name="cancel">Cancelar</string>
435
<string name="press_back_again">Pulse otra vez volver para salir</string>
44-
<string name="moving_success_partial">Algunos archivos no han podido ser movidos</string>
45-
<string name="copying_success_partial">Algunos archivos no han podido ser copiados</string>
46-
47-
<plurals name="items_deleted">
48-
<item quantity="one">1 elemento eliminado</item>
49-
<item quantity="other">%1$d elementos eliminados</item>
50-
</plurals>
51-
52-
<plurals name="items">
53-
<item quantity="one">1 elemento</item>
54-
<item quantity="other">%1$d elementos</item>
55-
</plurals>
6+
<string name="no_app_found">No app for opening this type of file is available</string>
567

578
<!-- Favorites -->
589
<string name="favorites">Favorites</string>
5910
<string name="add_to_favorites">Add to favorites</string>
6011
<string name="remove_from_favorites">Remove from favorites</string>
6112

62-
<!-- Settings -->
63-
<string name="show_hidden">Mostrar ficheros y directorios ocultos</string>
64-
6513
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
6614
<!-- Short description has to have less than 80 chars -->
6715
<string name="app_short_description">Un simple administrador de archivos para navegar por el árbol de directorios.</string>
6816
<string name="app_long_description">
6917
También puede ser utilizado para navegar por el directorio raíz y por el contenido de la tarjeta SD. Puede fácilmente renombrar, copiar, mover, eliminar y compartir lo que usted desee.
7018

71-
7219
No contiene anuncios ni permisos innecesarios. Es completamente OpenSource y además provee un tema oscuro.
7320

7421
Esta aplicación es tan solo una pequeña parte de una serie de aplicaciones. Puede encontrar el resto en http://www.simplemobiletools.com

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,20 @@
22
<resources>
33
<string name="app_name">Gestionnaire de fichiers simple</string>
44
<string name="app_launcher_name">Gestionnaire de fichiers</string>
5-
<string name="share_via">Partager avec</string>
6-
<string name="no_permissions">L\'application a besoin de la permission d\'accéder à votre support de stockage</string>
7-
<string name="no_app_found">Aucune app pour ouvrir ce type de fichier n\'est disponible</string>
8-
<string name="create_new">Créer un nouvel élement</string>
9-
<string name="rename_item">Renommer l\'élément</string>
10-
<string name="directory">Dossier</string>
11-
<string name="file">Fichier</string>
12-
<string name="name_taken">Un dossier ou fichier avec ce nom existe déjà</string>
13-
<string name="invalid_name">Le nom contient des caractères invalides</string>
14-
<string name="empty_name">Veuiller entrer un nom</string>
15-
<string name="error_occurred">Une erreur inconnu a eu lieu</string>
16-
<string name="delete">Supprimer</string>
17-
<string name="deleting">Suppression</string>
18-
<string name="undo">Annuler</string>
19-
<string name="rename">Renommer</string>
20-
<string name="properties">Propriétés</string>
21-
<string name="copy">Copier</string>
22-
<string name="copy_move">Copier/Déplacer</string>
23-
<string name="share">Partager</string>
24-
<string name="shared_files">Fichiers partagés via Gestionnaire de Fichiers Simple</string>
25-
<string name="no_files_selected">Aucun fichier sélectionné</string>
26-
<string name="copy_item">Copier l\'élément</string>
27-
<string name="copy_items">Copier des éléments</string>
28-
<string name="move">Déplacer</string>
29-
<string name="source">Source</string>
30-
<string name="destination">Destination</string>
31-
<string name="select_destination">Définir la destination</string>
32-
<string name="invalid_destination">Impossible d\'écrire à la destination définie</string>
33-
<string name="please_select_destination">Veuillez choisir une destination</string>
34-
<string name="source_and_destination_same">La source et la destination ne peuvent pas être identiques</string>
35-
<string name="copying">En copie</string>
36-
<string name="copying_success">Fichiers copiés avec succès</string>
37-
<string name="copy_move_failed">Une erreur a eu lieu</string>
38-
<string name="moving">Déplacement</string>
39-
<string name="moving_success">Fichiers déplacés avec succès</string>
40-
<string name="already_exists">Un fichier avec ce nom existe déjà</string>
41-
<string name="ok">Ok</string>
42-
<string name="cancel">Annuler</string>
435
<string name="press_back_again">Appuyer à nouveau sur le bouton retour pour quitter</string>
44-
<string name="moving_success_partial">Certains fichiers ne peuvent pas être déplacés</string>
45-
<string name="copying_success_partial">Certains fichiers ne peuvent pas être copiés</string>
46-
47-
<plurals name="items_deleted">
48-
<item quantity="one">1 élément supprimé</item>
49-
<item quantity="other">%1$d éléments supprimés</item>
50-
</plurals>
51-
52-
<plurals name="items">
53-
<item quantity="one">1 élément</item>
54-
<item quantity="other">%1$d éléments</item>
55-
</plurals>
6+
<string name="no_app_found">No app for opening this type of file is available</string>
567

578
<!-- Favorites -->
589
<string name="favorites">Favoris</string>
5910
<string name="add_to_favorites">Ajouter aux favoris</string>
6011
<string name="remove_from_favorites">Enlever des favoris</string>
6112

62-
<!-- Settings -->
63-
<string name="show_hidden">Montrer les fichiers et dossiers cachés</string>
64-
6513
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
6614
<!-- Short description has to have less than 80 chars -->
6715
<string name="app_short_description">Un gestionnaire de fichiers simple pour naviguer et éditer ses fichiers et dossiers.</string>
6816
<string name="app_long_description">
6917
Peut aussi être utilisé pour naviguer dans les fichiers à la racines et ceux de la carte SD. Vous pouvez facilement renommer, copier, déplacer, supprimmer et partager ce que vous voulez.
7018

71-
7219
Ne contient pas de pubs ou de permissions inutiles. C\'est un logiciel libre et open-source. Il y a un thème sombre.
7320

7421
Cette app est juste une pièce d\'une plus grande série d\'apps. Vous pouvez trouver le reste à http://www.simplemobiletools.com

0 commit comments

Comments
 (0)