Skip to content

Commit 330b6ec

Browse files
authored
Merge pull request #87 from brarcher/string-correction
String correction
2 parents 449419b + 3f5bcbb commit 330b6ec

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
lines changed

app/src/main/java/protect/card_locker/ImportExportActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState)
5252
}
5353

5454
// If the application does not have permissions to external
55-
// storage, as for it now
55+
// storage, ask for it now
5656

5757
if (ContextCompat.checkSelfPermission(ImportExportActivity.this,
5858
Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||

app/src/main/java/protect/card_locker/ImportExportTask.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ private boolean performExport(File exportFile, DBHelper db)
7676
Log.e(TAG, "Unable to export file", e);
7777
}
7878

79+
Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result);
80+
7981
return result;
8082
}
8183

@@ -126,9 +128,9 @@ protected void onCancelled()
126128
progress.dismiss();
127129
Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
128130
}
129-
130131
interface TaskCompleteListener
131132
{
132133
void onTaskComplete(boolean success, File file);
133134
}
135+
134136
}

app/src/main/res/layout/import_export_activity.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@
128128
android:layout_height="wrap_content"
129129
android:layout_gravity="center_horizontal"
130130
android:layout_marginTop="8dp"
131-
android:text="Use external application" />
132-
131+
android:text="@string/importOptionApplicationButton" />
133132

134133
<View
135134
android:id="@+id/dividerImportFixed"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<string name="importOptionFilesystemTitle">Import ze souborového systému</string>
6969
<string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
7070
<string name="importOptionFilesystemButton">Ze souborového systému</string>
71-
<string name="importOptionApplicationTitle">Import ze souborového systému</string>
71+
<string name="importOptionApplicationTitle">Použít externí aplikaci</string>
7272
<string name="importOptionApplicationExplanation">K otevření souboru použije externí aplikaci jako Dropbox, Google Drive, nebo vámi preferovaný prohlížeč souborů.</string>
7373
<string name="importOptionApplicationButton">Použít externí aplikaci</string>
7474
<string name="importOptionFixedTitle">Import z umístění exportu</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<string name="importOptionFilesystemTitle">Importiere vom Dateisystem</string>
5858
<string name="importOptionFilesystemExplanation">Wähle eine Datei im Speicher aus.</string>
5959
<string name="importOptionFilesystemButton">Vom Dateisystem</string>
60-
<string name="importOptionApplicationTitle">Importiere vom Dateisystem</string>
60+
<string name="importOptionApplicationTitle">Nutze eine externe App</string>
6161
<string name="importOptionApplicationExplanation">Wähle eine Datei aus einer App wie Dropbox, Google Drive, oder deinem bevorzugten Dateisystem aus.</string>
6262
<string name="importOptionApplicationButton">Nutze eine externe App</string>
6363
<string name="importOptionFixedTitle">Importiere vom Export Ort</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<string name="importOptionFilesystemTitle">Importer depuis le système de fichiers.</string>
7070
<string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
7171
<string name="importOptionFilesystemButton">Système de fichiers</string>
72-
<string name="importOptionApplicationTitle">Importer depuis le système de fichiers</string>
72+
<string name="importOptionApplicationTitle">Application externe</string>
7373
<string name="importOptionApplicationExplanation">Utilisez une application externe comme Dropbox, Google Drive, ou votre gestionnaire de fichiers favori pour ouvrir un fichier.</string>
7474
<string name="importOptionApplicationButton">Application externe</string>
7575
<string name="importOptionFixedTitle">Importer depuis le même emplacement que pour l\'export</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<string name="importOptionFilesystemTitle">Importa dal file system</string>
6666
<string name="importOptionFilesystemExplanation">Scegli un file dal file system.</string>
6767
<string name="importOptionFilesystemButton">Dal file system</string>
68-
<string name="importOptionApplicationTitle">Importa dal file system</string>
68+
<string name="importOptionApplicationTitle">Usa un\'applicazione esterna</string>
6969
<string name="importOptionApplicationExplanation">Usa un\'applicazione esterna come Dropbox, Google Drive o il tuo file manager preferito per aprire il file.</string>
7070
<string name="importOptionApplicationButton">Usa un\'applicazione esterna</string>
7171
<string name="importOptionFixedTitle">Importa da un altro posto</string>

app/src/main/res/values-lt/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<!-- needs translated --><string name="importOptionFilesystemTitle">Import from filesystem</string>
7070
<!-- needs translated --><string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
7171
<!-- needs translated --><string name="importOptionFilesystemButton">From filesystem</string>
72-
<!-- needs translated --><string name="importOptionApplicationTitle">Import from filesystem</string>
72+
<!-- needs translated --><string name="importOptionApplicationTitle">Use external application</string>
7373
<!-- needs translated --><string name="importOptionApplicationExplanation">Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file.</string>
7474
<!-- needs translated --><string name="importOptionApplicationButton">Use external application</string>
7575
<!-- needs translated --><string name="importOptionFixedTitle">Import from export location</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<string name="importOptionFilesystemTitle">Importeer van filesysteem</string>
6767
<string name="importOptionFilesystemExplanation">Kies een specifiek bestand van het filesysteem.</string>
6868
<string name="importOptionFilesystemButton">Van filesysteem</string>
69-
<string name="importOptionApplicationTitle">Importeer van filesysteem</string>
69+
<string name="importOptionApplicationTitle">Gebruik externe applicatie</string>
7070
<string name="importOptionApplicationExplanation">Gebruik een externe applicatie zoals Dropbox, Google Drive of je favoriete bestandsbeheer om een bestand te openen.</string>
7171
<string name="importOptionApplicationButton">Gebruik externe applicatie</string>
7272
<string name="importOptionFixedTitle">Importeer van exporteerlocatie</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<string name="importOptionFilesystemTitle">Import from filesystem</string>
5858
<string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
5959
<string name="importOptionFilesystemButton">From filesystem</string>
60-
<string name="importOptionApplicationTitle">Import from filesystem</string>
60+
<string name="importOptionApplicationTitle">Use external application</string>
6161
<string name="importOptionApplicationExplanation">Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file.</string>
6262
<string name="importOptionApplicationButton">Use external application</string>
6363
<string name="importOptionFixedTitle">Import from export location</string>

0 commit comments

Comments
 (0)