Merge branch 'master' into coverity_scan

Conflicts: .travis.yml
ruleant · Oct 18, 2014 · 75b004c · 75b004c
2 parents 5520a6c + f79a3e6
commit 75b004c
Show file tree

Hide file tree

Showing 17 changed files with 340 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 #based on https://raw.github.com/leviwilson/android-travis-ci-example/master/.travis.yml
-language: java
-jdk:
-  # build only against one JDK for coverity scan
-  #- openjdk7
-  - oraclejdk8
+language: android
+android:
+  components:
+    - android-20
 env:
   global:
     - secure: "mMIHz+I2pZK7I9PvhkTIRDeXJJIZTwigAamHnaId1q9YO7LvBoCKsJCI7pepbK303lTZJqkTgyTti9xSsYjzMIIMT8G+YBfVqoiy6wWOZjwjjZxn5Mw7g3qxRRdpXCc7B7hBBTEiEzC0Bp3QwPQtwdFDlACwgHWsbDLiaweIglg="
@@ -17,30 +16,20 @@ before_install:
   - if [[ -d buildtime-trend/.git ]]; then cd buildtime-trend; git pull; cd ..; else git clone https://github.com/ruleant/buildtime-trend.git; fi
   - source buildtime-trend/init.sh
   - mvn -v
-  # install necessary x32-libs for Android SDK, see http://rkistner.github.io/android/2013/02/05/android-builds-on-travis-ci/
   - timestamp.sh install_libs
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libstdc++6:i386 lib32z1 python-pip
+  - sudo apt-get install -qq python-pip
   # install buildtime-trend dependencies using pip
   - timestamp.sh install_python_libs
   - sudo CFLAGS="-O0" pip install -r ${BUILD_TREND_HOME}/requirements.txt
-  # download the latest android sdk and unzip
-  - timestamp.sh install_android_sdk
-  - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
-  - tar -zxf android-sdk_r23.0.2-linux.tgz
-  - export ANDROID_HOME=`pwd`/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-  # only update the sdk for the tools and platform-tools and required api level
-  # (run "android list sdk --extended" to get the full list)
-  - echo "y" | android update sdk -a --filter tools,platform-tools,build-tools-20.0.0,android-20 --no-ui --force
   # deploy android SDK jar to local maven repository
+  - timestamp.sh deploy_android_sdk
   - $TRAVIS_BUILD_DIR/.utility/deploy-sdk-to-m2-repo.sh
   # return to directory where the repository being built has been copied on the worker.
   - cd $TRAVIS_BUILD_DIR
-  - timestamp.sh build
 script:
   - timestamp.sh test
-  - mvn test -B
+  - ./gradlew clean check
 after_success:
   # send code coverage results to coveralls.io
   - timestamp.sh coverage

diff --git a/ChangeLog b/ChangeLog
@@ -11,6 +11,7 @@
  - issue #161 : implement isValidFragment to fix Android bug fixed in Android
  API 19 (Kitkat), thanks to Олег Нощенко for reporting
  - CID 72849 : fix Coverity issue : dereference null return value
+ - translated to Japanese, thanks to naofum and J.S.Sebastian
 
  v0.3 (released on 07Jul2014)
  - CID 60865 : fix Coverity issue : dereference null return value

diff --git a/res/layout/dialog_location_name.xml b/res/layout/dialog_location_name.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <TextView
-        android:id="@+id/question"
+        android:id="@+id/location_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"

diff --git a/res/menu/common.xml b/res/menu/common.xml
@@ -10,6 +10,11 @@
         android:orderInCategory="40"
         android:showAsAction="ifRoom"
         android:title="@string/store_location"/>
+    <item
+        android:id="@+id/menu_renamedestination"
+        android:orderInCategory="41"
+        android:showAsAction="never"
+        android:title="@string/rename_destination"/>
     <item
         android:id="@+id/menu_refresh"
         android:orderInCategory="60"

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
@@ -95,4 +95,7 @@ Haurieu de rebre una còpia de la llicència pública general GNU junt amb aques
     <string name="cancel">Cancel·la</string>
     <string name="location_name_stored">S\'ha desat la posició \'%s\'</string>
     <string name="no_location_name">No s\'ha indicat cap nom de posició</string>
+    <string name="dialog_rename_destination">Introduïu un nou nom pel vostre destí:</string>
+    <string name="rename_destination">Canvia el nom del destí</string>
+    <string name="rename_destination_disabled">No es pot canviar el nom del destí, primer cal desar una posició</string>
     </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
@@ -71,8 +71,33 @@ Kopii Obecné veřejné licence GNU jste měli obdržet spolu s tímto programem
     <string name="northwest_unit">SZ</string>
     <string name="destination_reached">Na cíl</string>
     <string name="no_destination">Nebyl nastaven cíl</string>
-    <string name="pref_enable_sensors">Povolit čidla (pokud možno)</string>
+    <string name="pref_enable_sensors">Použít čidla</string>
     <string name="pref_geo_orientation_sensor">Výchozí čidlo orientace</string>
     <string name="sensors_enabled">Povoleno: přesnější a rychlejší změny azimutu</string>
     <string name="sensors_disabled">Vypnuto: šetří energii</string>
+    <string name="dialog_store_location_name">Zadejte název tohoto místa:</string>
+    <string name="location_name">Název místa</string>
+    <string name="cancel">Zrušit</string>
+    <string name="location_name_stored">Uloženo místo „%s“</string>
+    <string name="no_location_name">Nebyl zadán název místa</string>
+    <string name="name">Název</string>
+    <string name="sensor_bearing_offset">Posun azimutu založený na čidlech</string>
+    <string name="travel_direction">Směr cesty</string>
+    <string name="travel_direction_forward">Dopředu</string>
+    <string name="travel_direction_backwards">Zpět</string>
+    <plurals name="distance_meter">
+	<item quantity="one">%d metr</item>
+	<item quantity="other">%d metry</item>
+</plurals>
+    <plurals name="time_seconds">
+	<item quantity="one">%d sekunda</item>
+	<item quantity="other">%d sekundy</item>
+</plurals>
+    <plurals name="time_minutes">
+	<item quantity="one">%d minuta</item>
+	<item quantity="other">%d minuty</item>
+</plurals>
+    <string name="dialog_rename_destination">Zadejte nový název pro cíl:</string>
+    <string name="rename_destination">Přejmenovat cíl</string>
+    <string name="rename_destination_disabled">Nelze přejmenovat cíl, nejprve umístění uložte</string>
     </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
@@ -95,4 +95,8 @@
     <string name="dialog_store_location_name">Angiv et navn til din nuværende placering:</string>
     <string name="location_name">Placeringens navn</string>
     <string name="no_location_name">Placeringens navn blev ikke angivet</string>
+    <string name="dialog_rename_destination">Indtast et nyt navn for destinationen:</string>
+    <string name="rename_destination">Omdøb destinationen</string>
+    <string name="rename_destination_disabled">Kan ikke omdøbe destinationen, gem en placering først</string>
+    <string name="destination_renamed">Destination omdøbt</string>
     </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -9,7 +9,7 @@ Usted ha debido de recibir una copia de la Licencia General Pública de GNU junt
     <string name="inaccurate_location">Tu ubicación actual es inexacta</string>
     <string name="notice_no_dest">Guarda tu ubicación para elegir un destino</string>
     <string name="inaccurate_direction">Comienza a moverte para obtener una dirección precisa hacia tu destino</string>
-    <string name="notice_destination_reached">Has llegado a tu destino</string>
+    <string name="notice_destination_reached">Ha llegado a su destino</string>
     <string name="current_speed">Velocidad actual</string>
     <string name="speed_kph">km/h</string>
     <string name="distance">Distancia</string>
@@ -26,7 +26,7 @@ Usted ha debido de recibir una copia de la Licencia General Pública de GNU junt
     <string name="dialog_store_location">¿Desea guardar su ubicación actual?</string>
     <string name="no">No</string>
     <string name="store_location">Guardar ubicación</string>
-    <string name="store_location_disabled">No se puede guardar ubicación si no hay una ubicación actual</string>
+    <string name="store_location_disabled">No se puede guardar la ubicación sin una ubicación actual</string>
     <string name="location_stored">Ubicación guardada</string>
     <string name="menu_details">Detalles de la ubicación</string>
     <string name="activity_details">Detalles</string>
@@ -47,8 +47,8 @@ Usted ha debido de recibir una copia de la Licencia General Pública de GNU junt
     <string name="altitude">Altitud</string>
     <string name="speed">Velocidad</string>
     <string name="travel_direction">Dirección de ruta</string>
-    <string name="travel_direction_forward">Adelante</string>
-    <string name="travel_direction_backwards">atrás</string>
+    <string name="travel_direction_forward">Hacia adelante</string>
+    <string name="travel_direction_backwards">Hacia atrás</string>
     <string name="accuracy">Exactitud</string>
     <string name="destination">Destino</string>
     <string name="direction_relative">relativo a la dirección actual</string>
@@ -60,7 +60,7 @@ Usted ha debido de recibir una copia de la Licencia General Pública de GNU junt
     <string name="timestamp">Marcador de tiempo</string>
     <string name="notset">Sin configurar</string>
     <string name="loc_updated_not_recent">Ubicación NO actualizada recientemente.</string>
-    <string name="settings">Configuraciones</string>
+    <string name="settings">Configuración</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_loc_update">Actualizaciones de la ubicación</string>
     <string name="pref_loc_update_dist">Actualizaciones basadas en distancia</string>
@@ -78,4 +78,21 @@ Usted ha debido de recibir una copia de la Licencia General Pública de GNU junt
     <string name="sensors_enabled">Habilitado: actualizaciones más rápidas y giros más precisos; Habilitado: actualizaciones más rápidas y movimientos más precisos</string>
     <string name="about">Acerca de</string>
     <string name="build_time">Compilado en %s.</string>
+    <string name="dialog_store_location_name">Poner un nombre a la ubicación actual:</string>
+    <string name="cancel">Cancelar</string>
+    <string name="location_name_stored">Ubicación \'%s\' guardada</string>
+    <string name="name">Nombre</string>
+    <plurals name="time_minutes">
+	<item quantity="one">%d minuto</item>
+	<item quantity="other">%d minutos</item>
+</plurals>
+    <plurals name="distance_meter">
+	<item quantity="one">%d metro</item>
+	<item quantity="other">%d metros</item>
+</plurals>
+    <plurals name="time_seconds">
+	<item quantity="one">%d segundo</item>
+	<item quantity="other">%d segundos</item>
+</plurals>
+    <string name="location_name">Nombre de la ubicación</string>
     </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
@@ -1,2 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="direction">方向</string>
+    <string name="copyright">著作権</string>
+    <plurals name="distance_meter">
+	<item quantity="one">%d メートル</item>
+	<item quantity="other"/>
+</plurals>
+    <plurals name="time_seconds">
+	<item quantity="one">%d 秒</item>
+	<item quantity="other"/>
+</plurals>
+    <plurals name="time_minutes">
+	<item quantity="one">%d 分</item>
+	<item quantity="other"/>
+</plurals>
+    <string name="speed">速度</string>
+    <string name="latitude">緯度</string>
+    <string name="longitude">経度</string>
+    <string name="loc_provider_gps">GPS</string>
+    <string name="location_name">地名</string>
+    <string name="settings">設定</string>
+    <string name="pref_header_general">全般</string>
+    <string name="pref_header_loc_update">場所の更新</string>
+    <string name="app_desc">GPS座標を使用して、以前に訪れた場所へ戻る方法を探す。</string>
+    <string name="inaccurate_location">現在の場所に間違いがあります</string>
+    <string name="notice_no_dest">目的地を設定するためにあなたの場所を保存してください</string>
+    <string name="inaccurate_direction">目的地までの正確な方向を取得するために移動を開始してください</string>
+    <string name="notice_destination_reached">目的地に到着しました</string>
+    <string name="current_speed">現在のスピード</string>
+    <string name="speed_kph">km/h</string>
+    <string name="current_bearing">現在の方角</string>
+    <string name="distance">距離</string>
+    <string name="northeast_unit">北東</string>
+    <string name="southeast_unit">南東</string>
+    <string name="southwest_unit">南西</string>
+    <string name="northwest_unit">北西</string>
+    <string name="location_updated">場所を更新しました</string>
+    <string name="inaccurate">不正確</string>
+    <string name="destination_reached">目的地です</string>
+    <string name="no_destination">目的地がセットされていません</string>
+    <string name="unknown">不明</string>
+    <string name="refresh">更新</string>
+    <string name="dialog_store_location_name">現在の場所の名前を入力してください:</string>
+    <string name="dialog_rename_destination">目的地の新しい名前を入力してください:</string>
+    <string name="cancel">キャンセル</string>
+    <string name="store_location">場所を保存</string>
+    <string name="rename_destination">場所の名前を変更</string>
+    <string name="store_location_disabled">現在の場所が存在しない場合、場所を保存することができません</string>
+    <string name="rename_destination_disabled">目的地の名前を変更できません。先に場所を保存してください</string>
+    <string name="location_stored">場所を保存しました</string>
+    <string name="location_name_stored">場所 \'%s\' を保存しました</string>
+    <string name="no_location_name">場所の名前が指定されていません</string>
+    <string name="menu_details">場所の詳細</string>
+    <string name="activity_details">詳細</string>
+    <string name="location_provider">場所プロバイダー</string>
+    <string name="name">名前</string>
+    <string name="provider">プロバイダー</string>
+    <string name="loc_provider_network">ネットワーク (携帯電話/WiFi)</string>
+    <string name="provider_no_support">プロバイダーはサポートされていません。</string>
+    <string name="location">場所</string>
+    <string name="stored_location">保存済の場所</string>
+    <string name="curr_location">現在の (最新の) 場所</string>
+    <string name="latitude_north_unit">北</string>
+    <string name="latitude_south_unit">南</string>
+    <string name="longitude_east_unit">東</string>
+    <string name="longitude_west_unit">西</string>
+    <string name="altitude">高度</string>
+    <string name="sensor_bearing_offset">センサーの方角オフセット</string>
+    <string name="travel_direction">進行方向</string>
+    <string name="travel_direction_forward">前方</string>
+    <string name="travel_direction_backwards">後方</string>
+    <string name="accuracy">精度</string>
+    <string name="timestamp">タイムスタンプ</string>
+    <string name="destination">目的地</string>
+    <string name="to_dest">目的地へ</string>
+    <string name="direction_relative">現在の向きを基準に</string>
+    <string name="raw">未フォーマット</string>
+    <string name="none">なし</string>
+    <string name="notset">未セット</string>
+    <string name="loc_updated_recent">場所は最近更新されました。</string>
+    <string name="loc_updated_not_recent">場所は最近更新されていません。</string>
+    <string name="pref_loc_update_dist">距離に基づく更新</string>
+    <string name="pref_loc_update_time">時間に基づく更新</string>
+    <string name="pref_enable_sensors">利用可能なセンサーを使用</string>
+    <string name="pref_geo_orientation_sensor">デフォルトの方位センサー</string>
+    <string name="sensors_enabled">有効 : より迅速な更新、より正確な方角</string>
+    <string name="sensors_disabled">無効 : 電力を節約</string>
+    <string name="disabled">無効</string>
+    <string name="about">アプリについて</string>
+    <string name="version">バージョン</string>
+    <string name="build_time">%s にビルド。</string>
+    <string name="app_website">詳細は &lt;a href=%1$s&gt;webサイト&lt;/a&gt; を参照してください。</string>
+    <string name="license">This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a>.</string>
+<string name="bearing">方角</string>
+    </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
@@ -92,4 +92,8 @@
     <string name="cancel">취소</string>
     <string name="location_name_stored">위치 \'%s\' 저장됨</string>
     <string name="no_location_name">위치 이름을 지정하지 않았습니다</string>
+    <string name="dialog_rename_destination">목적지의 새 이름을 입력 합니다:</string>
+    <string name="rename_destination">목적지 이름변경</string>
+    <string name="rename_destination_disabled">목적지 이름을 바꿀수 없습니다, 먼저 위치를 저장하세요.</string>
+    <string name="destination_renamed">대상 변경</string>
     </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
@@ -97,4 +97,7 @@ Je zou een kopie van de GNU Algemene Publieke Licentie moeten hebben ontvangen s
     <string name="cancel">Annuleren</string>
     <string name="location_name_stored">Locatie \'%s\' bewaard</string>
     <string name="no_location_name">Geen locatienaam ingegeven</string>
+    <string name="dialog_rename_destination">Geef je bestemming een nieuwe naam :</string>
+    <string name="rename_destination">Hernoem bestemming</string>
+    <string name="rename_destination_disabled">Niet mogelijk om bestemming te hernoemen, sla eerst een locatie op</string>
     </resources>