diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-23 20:33:50 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-23 20:33:50 +0200 |
| commit | 4b14aaf18789616d44fa97d98f79deb4159f4e71 (patch) | |
| tree | b29e03ac7918a332f50ccf80551d988165a4b635 /main/res | |
| parent | 8a65466c9c79e529c80ff0dd0091099126b8b3a4 (diff) | |
| parent | e01cf90397eeb85bc18f8648c4942b6dba460513 (diff) | |
| download | cgeo-4b14aaf18789616d44fa97d98f79deb4159f4e71.zip cgeo-4b14aaf18789616d44fa97d98f79deb4159f4e71.tar.gz cgeo-4b14aaf18789616d44fa97d98f79deb4159f4e71.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values-ja/strings.xml | 2 | ||||
| -rw-r--r-- | main/res/values/strings_not_translatable.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index c0c7974..e21d2bf 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -236,7 +236,7 @@ <string name="menu_settings">設定</string> <string name="menu_history">履歴</string> <string name="menu_filter">フィルター</string> - <string name="menu_scan_geo">QRコードスキャン</string> <!-- It is more suitable "QRcode" than "Geocode" in Japanese, because "Geocode" is not commonly known. Issue #794 https://github.com/cgeo/c-geo-opensource/issues/794 --> + <string name="menu_scan_geo">QRコードスキャン</string> <!-- It is more suitable "QRcode" than "Geocode" in Japanese, because "Geocode" is not commonly known. Issue #794 https://github.com/cgeo/cgeo/issues/794 --> <!-- main screen --> <string name="live_map_button">地図</string> diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml index 2ac3c5d..0fb6179 100644 --- a/main/res/values/strings_not_translatable.xml +++ b/main/res/values/strings_not_translatable.xml @@ -158,7 +158,7 @@ · Corrections for light scheme on Adnroid 2.x devices\n
· Avoid crash if logging page is opened while not connected correctly\n
\n
- <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=9&state=closed">Detailed list of all changes</a>\n
+ <a href="https://github.com/cgeo/cgeo/issues?milestone=9&state=closed">Detailed list of all changes</a>\n
\n
<b>Known Limitations/Bugs:</b>\n
· Live map:\n
|