diff options
| author | rsudev <rasch@munin-soft.de> | 2014-07-11 21:21:29 +0200 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2014-07-11 21:21:29 +0200 |
| commit | d5861dd4427c4354892c38675bf7ceb1ac725fbd (patch) | |
| tree | 5a87e9499463ee4be146dea3ddc20718cb20b73b | |
| parent | 90c7d03a8e46de4096eb9ba10d5c656f1ead66b8 (diff) | |
| parent | e2faad8c6bf01d965f35ca9c89fda6506601c625 (diff) | |
| download | cgeo-d5861dd4427c4354892c38675bf7ceb1ac725fbd.zip cgeo-d5861dd4427c4354892c38675bf7ceb1ac725fbd.tar.gz cgeo-d5861dd4427c4354892c38675bf7ceb1ac725fbd.tar.bz2 | |
Merge branch 'release'
| -rw-r--r-- | main/res/values-ca/strings.xml | 4 | ||||
| -rw-r--r-- | main/res/values/changelog_release.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml index f72f2ea..42183f0 100644 --- a/main/res/values-ca/strings.xml +++ b/main/res/values-ca/strings.xml @@ -518,13 +518,13 @@ <string name="map_source_osm_mapnik">OSM: Mapnik</string> <string name="map_source_osm_cyclemap">OSM: Cyclemap</string> <string name="map_source_osm_offline">Fora de línia</string> - <string name="init_sendToCgeo">Envia al c:geo</string> + <string name="init_sendToCgeo">Send to c:geo</string> <string name="settings_info_send2cgeo_title">Informació sobre send2cgeo</string> <string name="init_sendToCgeo_name">El nom del teu dispositiu</string> <string name="init_sendToCgeo_description"><b>Send2c:geo</b> us permet enviar els catxés al vostre aparell Android directament des de Geocaching.com utilitzant un complement especial per al Firefox o pel Chrome. Abans de registrar-vos veieu <a href="http://send2.cgeo.org/"> http://send2.cgeo.org/</a>. Només cal que us registreu si voleu utilitzar el send2c:geo.</string> <string name="init_sendToCgeo_register">Sol·licita registre</string> <string name="init_sendToCgeo_registering">S\'està registrant el dispositiu per Send2c:geo…</string> - <string name="init_sendToCgeo_register_ok">Us heu registrat correctament. El codi PIN és ####. Utilitzeu-lo al web del c:geo per connectar aquest dispositiu al navegador.</string> + <string name="init_sendToCgeo_register_ok">Us heu registrat correctament. El codi PIN és ####. Utilitzeu-lo a la pàgina web del c:geo per connectar aquest dispositiu al navegador.</string> <string name="init_sendToCgeo_register_fail">S\'ha produït un error en el registre del sendToCgeo.</string> <string name="sendToCgeo_download_fail">El c:geo ha fallat al descarregar els catxés. No hi ha connexió a Internet o el send2c:geo no funciona.</string> <string name="sendToCgeo_no_registration">S\'ha produït un error descarregant els catxés. El registre a send2c:geo ha caducat. Registreu-vos de nou a la configuració.</string> diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 3c87b62..9fa7d0c 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -5,6 +5,8 @@ <b>Next bugfix release:</b>\n · Fix: Caches not stored if \"Ask for list\" is disabled\n · Fix: Use \"Unknown\" instead of \"Mystery\" in GPX export to ensure backward compatibility\n + · Fix: Avatar not shown in login confirmation screen\n + · Fix: Loading more than 40 caches in search results\n \n <b>2014.06.11:</b>\n · Fix: Adapting to changes on gc.com\n |