8000 Fix strings by moving-bits · Pull Request #16994 · cgeo/cgeo · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix strings #16994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2025
Merged

Fix strings #16994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
8000 Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main/src/main/java/cgeo/geocaching/export/FieldNoteExport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class FieldNoteExport extends AbstractExport {
private final String fileName;

public FieldNoteExport() {
super(R.string.export_fieldnotes);
super(R.string.fieldnotes);
final SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
fileName = fileNameDateFormat.format(new Date()) + ".txt";
}
Expand All @@ -52,7 +52,7 @@ public void export(@NonNull final List<Geocache> cachesList, @Nullable final Act
@SuppressLint("SetTextI18n")
private Dialog getExportOptionsDialog(final Geocache[] caches, final Activity activity) {
final AlertDialog.Builder builder = Dialogs.newBuilder(activity);
builder.setTitle(activity.getString(R.string.export_confirm_title, activity.getString(R.string.export_fieldnotes)));
builder.setTitle(activity.getString(R.string.export_confirm_title, activity.getString(R.string.fieldnotes)));

final View layout = View.inflate(activity, R.layout.fieldnote_export_dialog, null);
builder.setView(layout);
Expand Down
4 changes: 2 additions & 2 deletions main/src/main/java/cgeo/geocaching/export/GpxExport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class GpxExport extends AbstractExport {
private String title = null;

public GpxExport() {
super(R.string.export_gpx);
super(R.string.gpx);
}

public void export(@NonNull final List<Geocache> caches, @Nullable final Activity activity, @Nullable final String title) {
Expand Down Expand Up @@ -73,7 +73,7 @@ private void calculateFileName(final String[] geocodes) {

private Dialog getExportDialog(final String[] geocodes, final Activity activity) {
final AlertDialog.Builder builder = Dialogs.newBuilder(activity);
builder.setTitle(activity.getString(R.string.export_confirm_title, activity.getString(R.string.export_gpx)));
builder.setTitle(activity.getString(R.string.export_confirm_title, activity.getString(R.string.gpx)));

final View layout = View.inflate(activity, R.layout.gpx_export_dialog, null);
builder.setView(layout);
Expand Down
2 changes: 1 addition & 1 deletion main/src/main/res/menu/cache_list_options.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
<item
android:id="@+id/menu_export"
android:icon="@drawable/ic_menu_share"
android:title="@string/export"
android:title="@string/export_upload"
app:showAsAction="never|withText">
<menu>
<item
Expand Down
5 changes: 4 additions & 1 deletion main/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2202,11 +2202,14 @@

<!-- export -->
<string name="share_export">Share / Export</string>
<string name="export">Export / Upload</string>
<string name="export">Export</string>
<string name="export_upload">Export / Upload</string>
<string name="export_progress">Export: %1$s</string>
<string name="export_exportedto">exported to</string>
<string name="export_failed">Export failed</string>
<string name="export_gpx">Export GPX</string>
<string name="export_fieldnotes">Export field notes</string>
<string name="fieldnotes">field notes</string>
<string name="export_fieldnotes_info">Field Notes will be exported to /sdcard/field-notes with the current date and time as their file name.</string>
<string name="export_fieldnotes_upload">Upload to geocaching.com</string>
<string name="export_fieldnotes_uploading">Uploading…</string>
Expand Down
2 changes: 1 addition & 1 deletion main/src/main/res/values/strings_not_translatable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<string translatable="false" name="persistablefolder_wherigo">Wherigo</string>

<!-- export -->
<string translatable="false" name="export_gpx">Export GPX</string>
<string translatable="false" name="gpx">GPX</string>

<!-- map sources -->
<string translatable="false" name="map_source_osm_mapnik">OpenStreetMap.org</string>
Expand Down
Loading
0