diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-13 18:55:43 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-13 18:55:43 +0100 |
| commit | ffa2e166ba13c9cace1a6a0fc98d210b42ca37b1 (patch) | |
| tree | 662c7646301eb944222fe778e86062a6f758669b /main | |
| parent | c8336a55470b157112f06f54c23a427bf6883e0e (diff) | |
| parent | 4fb870a5d8446c2d6fb7aeedac1e72327b67b961 (diff) | |
| download | cgeo-ffa2e166ba13c9cace1a6a0fc98d210b42ca37b1.zip cgeo-ffa2e166ba13c9cace1a6a0fc98d210b42ca37b1.tar.gz cgeo-ffa2e166ba13c9cace1a6a0fc98d210b42ca37b1.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/src/cgeo/geocaching/enumerations/LogType.java
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values-fr/strings.xml | 1 | ||||
| -rw-r--r-- | main/res/values-pt/strings.xml | 1 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/LogType.java | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 40b0685..41a4600 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -72,6 +72,7 @@ <string name="log_maintenance_needed">Nécessite une maintenance</string> <string name="log_update">Coordonnées mises à jour</string> <string name="log_archived">Archivée</string> + <string name="log_unarchived">Désarchivée</string> <string name="log_needs_archived">Nécessite d\'être archivée</string> <string name="log_discovered">Découverte</string> <string name="log_reviewer">Note du relecteur</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 7094ed3..9516927 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -72,6 +72,7 @@ <string name="log_maintenance_needed">Precisa manutenção</string> <string name="log_update">Coordenadas actualizadas</string> <string name="log_archived">Arquivada</string> + <string name="log_unarchived">Desarquivada</string> <string name="log_needs_archived">Precisa de arquivamento</string> <string name="log_discovered">Descoberta</string> <string name="log_reviewer">Nota de revisor</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 023f869..5bec200 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -72,6 +72,7 @@ <string name="log_maintenance_needed">Needs Maintenance</string> <string name="log_update">Updated Coordinates</string> <string name="log_archived">Archived</string> + <string name="log_unarchived">Unarchived</string> <string name="log_needs_archived">Needs Archived</string> <string name="log_discovered">Discovered</string> <string name="log_reviewer">Reviewer Note</string> diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java index a68e8af..559b27f 100644 --- a/main/src/cgeo/geocaching/enumerations/LogType.java +++ b/main/src/cgeo/geocaching/enumerations/LogType.java @@ -21,6 +21,7 @@ public enum LogType { PUBLISH_LISTING(1003, "24", "publish listing", R.string.log_published, R.drawable.mark_green_more), ENABLE_LISTING(23, "23", "enable listing", R.string.log_enabled, R.drawable.mark_green_more), ARCHIVE(5, "5", "archive", R.string.log_archived, R.drawable.mark_red_more), + UNARCHIVE(12, "12", "unarchive", R.string.log_unarchived, R.drawable.mark_green_more), TEMP_DISABLE_LISTING(22, "22", "temporarily disable listing", R.string.log_disabled, R.drawable.mark_red_more), NEEDS_ARCHIVE(7, "7", "needs archived", R.string.log_needs_archived, R.drawable.mark_red), WILL_ATTEND(9, "9", "will attend", R.string.log_attend), |