summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vdrmanager/.gitignore1
-rw-r--r--vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lockbin17 -> 17 bytes
-rw-r--r--vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.binbin445238 -> 508126 bytes
-rw-r--r--vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.binbin6984941 -> 7434751 bytes
-rw-r--r--vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.binbin21482 -> 22172 bytes
-rw-r--r--vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.binbin111615 -> 124467 bytes
-rw-r--r--vdrmanager/.idea/misc.xml24
-rw-r--r--vdrmanager/.idea/workspace.xml461
-rw-r--r--vdrmanager/app/app-release.apkbin1839891 -> 1860061 bytes
-rw-r--r--vdrmanager/app/src/main/AndroidManifest.xml4
-rw-r--r--vdrmanager/app/src/main/res/values-fr/backup.xml31
-rw-r--r--vdrmanager/app/src/main/res/values-fr/strings.xml464
-rw-r--r--vdrmanager/app/src/main/res/values-fr/timers.xml13
-rw-r--r--vdrmanager/build/intermediates/dex-cache/cache.xml48
14 files changed, 847 insertions, 199 deletions
diff --git a/vdrmanager/.gitignore b/vdrmanager/.gitignore
new file mode 100644
index 0000000..bfa6a22
--- /dev/null
+++ b/vdrmanager/.gitignore
@@ -0,0 +1 @@
+# Created by .ignore support plugin (hsz.mobi)
diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock
index e100554..1420607 100644
--- a/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock
+++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock
Binary files differ
diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index a3c23c3..58a322f 100644
--- a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin
+++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index 9d4c937..db87096 100644
--- a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
+++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
index 7f4a29b..e62b331 100644
--- a/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
+++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
Binary files differ
diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index c1727ba..d81a215 100644
--- a/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
+++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/vdrmanager/.idea/misc.xml b/vdrmanager/.idea/misc.xml
index e930905..1a3eaff 100644
--- a/vdrmanager/.idea/misc.xml
+++ b/vdrmanager/.idea/misc.xml
@@ -3,6 +3,30 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
+ <component name="NullableNotNullManager">
+ <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+ <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+ <option name="myNullables">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+ </list>
+ </value>
+ </option>
+ <option name="myNotNulls">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+ </list>
+ </value>
+ </option>
+ </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
diff --git a/vdrmanager/.idea/workspace.xml b/vdrmanager/.idea/workspace.xml
index a3337ad..e4bb907 100644
--- a/vdrmanager/.idea/workspace.xml
+++ b/vdrmanager/.idea/workspace.xml
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="AndroidLayouts">
+ <shared>
+ <config />
+ </shared>
+ </component>
<component name="ChangeListManager">
<list default="true" id="b67c73a6-38b8-40ea-a024-48a0a359d6d1" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ColoredButton.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesome.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesomeButton.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/HITK.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/edit_remote_key.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/red_button.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/menu/remote_menu.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/roundedbutton.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ColoredButton.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ColoredButton.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesome.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesome.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesomeButton.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesomeButton.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/HITK.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/HITK.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/edit_remote_key.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/edit_remote_key.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable/red_button.xml" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/red_button.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu/remote_menu.xml" afterPath="$PROJECT_DIR$/app/src/main/res/menu/remote_menu.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable/roundedbutton.xml" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/roundedbutton.xml" />
</list>
<ignored path="vdrmanager.iws" />
<ignored path=".idea/workspace.xml" />
@@ -31,7 +36,33 @@
<favorites_list name="vdrmanager" />
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="VdrManagerActivity.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="GenerateSignedApkSettings">
+ <option name="KEY_STORE_PATH" value="$PROJECT_DIR$/../../keystores/vdrmanager/release.jks" />
+ <option name="KEY_ALIAS" value="vdrmanager" />
+ <option name="REMEMBER_PASSWORDS" value="true" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -1084,76 +1115,76 @@
<ExternalModuleBuildClasspathPojo>
<option name="entries">
<list>
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
</list>
</option>
<option name="path" value="$PROJECT_DIR$" />
@@ -1165,76 +1196,76 @@
<ExternalModuleBuildClasspathPojo>
<option name="entries">
<list>
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" />
- <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" />
+ <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" />
<option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/21.0.3/support-v4-21.0.3.aar" />
<option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/appcompat-v7/19.1.0/appcompat-v7-19.1.0.aar" />
<option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar" />
@@ -1266,6 +1297,13 @@
<projects_view />
</option>
</component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+ </list>
+ </option>
+ </component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
@@ -1277,9 +1315,10 @@
<order />
</component>
<component name="ProjectFrameBounds">
- <option name="y" value="39" />
- <option name="width" value="3200" />
- <option name="height" value="1761" />
+ <option name="x" value="178" />
+ <option name="y" value="572" />
+ <option name="width" value="3190" />
+ <option name="height" value="1324" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
@@ -1299,36 +1338,37 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
+ <autoscrollToSource PackagesPane="true" />
+ <autoscrollFromSource PackagesPane="true" />
<sortByType />
</navigator>
<panes>
- <pane id="Scope" />
- <pane id="AndroidView">
+ <pane id="PackagesPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="vdrmanager" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane">
+ <pane id="Scratches" />
+ <pane id="AndroidView">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="vdrmanager" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -1363,16 +1403,19 @@
</PATH>
</subPane>
</pane>
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="recentsLimit" value="5" />
- <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="" />
+ <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="FA43CWM09386" />
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Console Font" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="FullScreen" value="false" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../../keystores/vdrmanager/release.jks" />
+ <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" />
+ <property name="ExportApk.Flavors" value="" />
+ <property name="ExportApk.BuildType" value="release" />
</component>
<component name="RunManager" selected="Android Application.app">
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -1534,7 +1577,7 @@
<option name="DEPLOY" value="true" />
<option name="ARTIFACT_NAME" value="" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+ <option name="USE_LAST_SELECTED_DEVICE" value="true" />
<option name="PREFERRED_AVD" value="" />
<option name="USE_COMMAND_LINE" value="true" />
<option name="COMMAND_LINE" value="" />
@@ -1586,7 +1629,7 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="39" width="3200" height="1761" extended-state="6" />
+ <frame x="178" y="572" width="3190" height="1324" extended-state="0" />
<editor active="false" />
<layout>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1605,16 +1648,16 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27859896" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27944943" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32993197" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -1633,6 +1676,22 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@@ -1661,5 +1720,61 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-fr/backup.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-fr/timers.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-5.8867927">
+ <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-6.524272">
+ <caret line="196" column="24" selection-start-line="196" selection-start-column="24" selection-end-line="196" selection-end-column="24" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project> \ No newline at end of file
diff --git a/vdrmanager/app/app-release.apk b/vdrmanager/app/app-release.apk
index edee36b..4043fc1 100644
--- a/vdrmanager/app/app-release.apk
+++ b/vdrmanager/app/app-release.apk
Binary files differ
diff --git a/vdrmanager/app/src/main/AndroidManifest.xml b/vdrmanager/app/src/main/AndroidManifest.xml
index 9514f9e..6d56eac 100644
--- a/vdrmanager/app/src/main/AndroidManifest.xml
+++ b/vdrmanager/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.bjusystems.vdrmanager"
- android:versionCode="12250"
- android:versionName="12.25" >
+ android:versionCode="12260"
+ android:versionName="12.26" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/vdrmanager/app/src/main/res/values-fr/backup.xml b/vdrmanager/app/src/main/res/values-fr/backup.xml
new file mode 100644
index 0000000..6878060
--- /dev/null
+++ b/vdrmanager/app/src/main/res/values-fr/backup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+ <string name="generic_progress_title" translation_description="The title on a progress dialog asking the user to wait."> Veuillez attendre...</string>
+ <string name="generic_confirm_title" translation_description="The title on a confirmation dialog asking the user if he is sure?"> Êtes-vous sûr ?</string>
+ <string name="sd_card_canceled" translation_description="When importing/saving to the SD card, the message indicating that the operation was canceled."> Opération abandonnée.</string>
+ <string name="sd_card_error_no_storage" translation_description="When importing/saving to the SD card, the error message indicating that no SD card is found."> Pas de card SD trouvée.</string>
+ <string name="sd_card_import_error" translation_description="When importing from the SD card, the error message indicating not able to import."> Impossible d\'importer depuis la carte SD.</string>
+ <string name="sd_card_import_error_no_file" translation_description="When importing from the SD card, the error message indicating that no file is found on a SD card directory. %1$s: the SD card directory. E.g., '/mnt/sdcard/mybillingbuddy/'."> Pas de fichier trouvé dans %1$s.</string>
+ <string name="sd_card_import_progress_message" translation_description="When importing from the SD card, the progress message."> Import depuis la carte SD...</string>
+ <string name="sd_card_import_success" translation_description="When importing from the SD card, the success message."> Importation depuis la carte SD terminée.</string>
+ <string name="sd_card_save_error" translation_description="When saving to the SD card, the error message indicating not able to save."> Impossible de sauvegarder sur la carte SD.</string>
+ <string name="sd_card_save_error_create_dir" translation_description="When saving to the SD card, the error message indicating not able to create a directory on the SD card."> Impossible de créer un dossier sur la carte SD.</string>
+ <string name="sd_card_save_progress_message" translation_description="When saving to the SD card, the progress message."> Sauvegarde sur la carte SD...</string>
+ <string name="sd_card_save_success" translation_description="When saving to the SD card, the success message"> Fin de sauvegarde sur la carte SD.</string>
+ <string name="settings_backup_summary">Sauvegarde/Restore de vos données et des paramètres</string>
+ <string name="settings_backup_now" translation_description="In the 'Backup' settings, under the 'SD card' section, the option to backup to the SD card now. Character limit: ~26 (1 line)"> Sauvegarder maintenant</string>
+ <string name="settings_backup_now_summary">Créer un cliché des vos données et des paramètres</string>
+ <string name="settings_backup_now_progress_message" translation_description="In the 'Backup' settings, after pressing the 'Backup now' option, the progress message telling the user that it is writing all data and settings to the SD card."> Écriture de toutes les données et des paramètres...</string>
+ <string name="settings_backup_restore" translation_description="In the 'Backup' settings, under the 'SD card' section, the option to restore everything from the SD card. Character limit: ~26 (1 line)"> Restaurer maintenant</string>
+ <string name="settings_backup_restore_summary">Restaurer un cliché des paramètres et des données</string>
+ <string name="settings_backup" translation_description="In the 'Settings' page, the option to change the data backup related settings. Character limit: ~26 (1 line)"> Sauvegarder</string>
+ <string name="settings_backup_restore_confirm_message" translation_description="In the 'Backup' settings, after pressing the 'Restore now' option, the message in the alert dialog asking the user to confirm that he wants to restore from a backup and it will overwrite all the current data and settings."> Restaurer une sauvegarde depuis la carte DS écrasera toutes vos données et vos paramètres.</string>
+ <string name="settings_backup_restore_no_backup" translation_description="In the 'Backup' settings, after pressing the 'Restore now' option, the message in the alert dialog informing the user that there is no backup to restore from."> Pas de sauvegarde trouvée.</string>
+ <string name="settings_backup_restore_progress_message" translation_description="In the 'Backup' settings, after pressing the 'Restore now' option, the progress message informing that My Billinbg Buddy is reading all data and settings from the backup on the SD card."> Lecture des données et des paramètres...</string>
+ <string name="settings_backup_restore_select_title" translation_description="In the 'Backup' settings, after pressing the 'Restore now' option, the title in the picker dialog asking the user to select a backup."> Sélectionner une sauvegarde à restaurer</string>
+ <string name="settings_backup_key">Paramètres Sauvegardes</string>
+ <string name="settings_backup_now_key">Paramètres Sauvegarde Immédiate</string>
+ <string name="settings_backup_restore_key">Paramètres Sauvegarde Restaure</string>
+ <string name="choose">Choisir un fichier de sauvegarde</string>
+</resources>
diff --git a/vdrmanager/app/src/main/res/values-fr/strings.xml b/vdrmanager/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..9a4b8de
--- /dev/null
+++ b/vdrmanager/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources xmlns:tools="http://schemas.android.com/tools">
+ <string name="action_menu_channels">Chaînes</string>
+ <string name="action_menu_timers">Programmations</string>
+ <string name="action_menu_recordings">Enregistrements</string>
+ <string name="action_menu_epg">Liste EPG</string>
+ <string name="action_menu_search">Recherche EPG</string>
+ <string name="action_menu_wakeup">Réveil</string>
+ <string name="app_name">VDR-Manager</string>
+ <string name="channel_item_menu_epg">Afficher EPG</string>
+ <string name="channel_item_menu_stream">Direct en streaming</string>
+ <string name="channel_item_menu_hide">Cacher</string>
+ <string name="channel_item_menu_hide_permanent">Cacher en permanence</string>
+ <string name="channel_group_menu_hide">Cacher</string>
+ <string name="channel_group_menu_hide_permanent">Cacher en permanence</string>
+ <string name="menu_groupby">Grouper par</string>
+ <string name="groupby_group">Groupe</string>
+ <string name="groupby_provider">Fournisseur</string>
+ <string name="groupby_name">Nom</string>
+ <string name="groupby_source">Source</string>
+ <string name="groupby_channel">Par Chaîne</string>
+ <string name="groupby_date">Par Date</string>
+ <string name="groupby_name_all_channels_group">Toutes les chaînes</string>
+ <string name="groupby_window_title_templte">Grouper par %1$s</string>
+ <string name="common_delete">Supprimer</string>
+ <string name="prefs_current_value">Courant :</string>
+ <string name="prefs_current_value_template">\nCourant : %1$s</string>
+ <string name="prefs_current_value_not_set">&lt;non configurét&gt;</string>
+ <string name="no_connection">Pas de connexion</string>
+ <string name="aborted">Connexion interrompue.</string>
+ <string name="no_connection_retry">Réessayer</string>
+ <string name="refresh">Rafraîchir</string>
+ <string name="done">Fini</string>
+ <string name="share">Partager</string>
+ <string name="addtocal">Ajouter au calendrier</string>
+ <string name="search_reapt">Rediffusions</string>
+ <string name="share_chooser">Partager une entrée EPG</string>
+ <string name="about_text"> A propos de \"VDR-Manager\" Logiciel pour Android\n
+ Version %1$s\n
+ Si vous posséder un VDR à la maison accessible
+ par internet et un téléphone sous Android alors, vous trouverez surement ce programme utile.
+ Pour plus de détails visiter http://projects.vdr-developer.org/projects/vdr-manager/wiki.
+ Auteur :\n
+ bju&lt;herrlado@gmail.com&gt;
+ herrlado&lt;herrlado@gmail.com&gt;</string>
+ <string name="about_title">À propos de</string>
+ <string name="no_internet_connection">Pas de connexion aux données</string>
+ <string name="update_will_start_in">La mise à jour commencera dans une seconde</string>
+ <string name="epg_menu_search">Chercher dans l\'EPG</string>
+ <string name="epg_menu_times">Recherche horaires</string>
+ <string name="epg_item_menu_timer_add">Créer une programmation</string>
+ <string name="epg_item_menu_timer_record">Enregistrer</string>
+ <string name="epg_item_menu_timer_delete">Supprimer une programmation</string>
+ <string name="epg_item_menu_timer_modify">Modifier une programmation</string>
+ <string name="epg_item_menu_timer_enable">Activer une programmation</string>
+ <string name="epg_item_menu_timer_disable">Désactiver une programmation</string>
+ <string name="epg_no_items">Rien n\'a été trouvé&#8230;</string>
+ <string name="epg_client_errors">Une erreur s\'est produite, vérifier les logs&#8230;</string>
+ <string name="navigae_at_the_end">Fin</string>
+ <string name="navigae_at_the_start">Début</string>
+ <string name="epg_search_times_add">Ajouter du temps</string>
+ <string name="epg_search_times_window">Temps personnalisé</string>
+ <string name="epg_list_time_label">Qu\'y a-t-il maintenant</string>
+ <string name="epg_list_time_now">Maintenant</string>
+ <string name="epg_list_time_next">Après</string>
+ <string name="epg_list_time_adhoc">Ad Hoc</string>
+ <string name="epg_list_channel_spinner">Chaîne</string>
+ <string name="epg_list_search_label">Résultats de la recherche</string>
+ <string name="epg_event_share_text">Partager</string>
+ <string name="epg_event_imdb_text">Recherche sur IMDb</string>
+ <string name="epg_event_omdb_text">Recherche sur OMDB</string>
+ <string name="epg_event_tmdb_text">Recherche sur TMDb</string>
+ <string name="epg_eent_livetv_text">Diffusion en stream</string>
+ <string name="epg_event_create_timer_text">Ajouter une programmation</string>
+ <string name="epg_event_modify_timer_text">Modifier une programmation</string>
+ <string name="epg_search_button">Rechercher</string>
+ <string name="epg_duration_template">%1$s min</string>
+ <string name="epg_duration_template_live">%1$s/%2$s min</string>
+ <string name="epg_of_a_channel">%1$s, %2$s/%3$s</string>
+ <string name="epg_by_channel">EPG par chaîne</string>
+ <string name="epg_by_search">Recherche EPG</string>
+ <string name="epg_by_search_param">Recherche EPG : \'%1$s\'</string>
+ <string name="epg_by_time">EPG par heure</string>
+ <string name="epg_by_time_args">EPG par heure : \'%1$s\'</string>
+ <string name="search_epg_hint">Recherche EPG</string>
+ <string name="epg_search_settings_description">Rechercher dans l\'EPG de VDR</string>
+ <string name="epg_window_title_count">%1$s, %2$s éléments</string>
+ <string name="channels_window_title_count">%1$s,%2$s%3$s</string>
+ <string name="new_timer">Nouvelle programmation</string>
+ <string name="vdr_error_text">La communication avec VDR a généré une erreur : %1$s</string>
+ <string name="livetv">TV en direct</string>
+ <string name="settings_livetv_summary">Streamdev-server sur VDR et un lecteur externe comme VPlayer sont nécessaire</string>
+ <string name="settings_livetv_streamformat">Format du streaming</string>
+ <string name="settings_livetv_port">Port du streaming</string>
+ <string name="settings_livetv_port_summary">Par défaut 3000. L\'accès doit être autoriser dans
+streamdevhosts.conf.</string>
+ <string-array name="livetv_streamformat">
+ <item>TS</item>
+ <item>PES</item>
+ <item>ES</item>
+ <item>PS</item>
+ </string-array>
+ <string name="key_remux_enable">remux_activé</string>
+ <string name="key_remux_command">remux_commande</string>
+ <string name="key_remux_parameter">remux_paramètre</string>
+ <string name="stream_via_as">Stream</string>
+ <string name="stream_choose_audio">Choisir la Piste Audio</string>
+ <string name="stream_via">via %s</string>
+ <string name="stream_as">comme %s</string>
+ <string name="remux_title">Remux</string>
+ <string name="remux_enable_title">Autoriser Remux</string>
+ <string name="remux_enable_summary">Autoriser le streaming via remux (ex: externremux.sh)</string>
+ <string name="remux_command_title">Commande</string>
+ <string name="remux_command_summary">Typiquement EXT ou Externe ex: http://vdr:3000/EXT/1</string>
+ <string name="remux_parameter_title">Paramètre</string>
+ <string name="remux_parameter_summary">Contrôle de la qualité du flux. Ex : http://vdr:3000/EXT;DSL1000/1</string>
+ <string name="main_menu_preferences">Préférences</string>
+ <string name="main_menu_info">Info</string>
+ <string name="main_menu_exit">Sortir</string>
+ <string name="main_menu_goto">Changement de périphérique</string>
+ <string name="main_menu_goto_title">Basculer vers&#8230;</string>
+ <string name="main_menu_goto_no_vdr">Impossible de charger le périphérique sélectionné :(</string>
+ <string name="main_menu_switched_to">Basculer vers %1$s</string>
+ <string name="vdr_devices_summary">Définir un ou plusieurs équipements VDR.</string>
+ <string name="vdr_devices">Équipement VDR</string>
+ <string name="vdr_preferences">Paramètres réseau</string>
+ <string name="vdr_host_title">Hôte VDR</string>
+ <string name="vdr_host_summary">Hôte VDR en fonctionnement</string>
+ <string name="vdr_port_title">Port pour plugin VDR </string>
+ <string name="vdr_port_summary">Port pour les connexions au plugin VDR</string>
+ <string name="vdr_password_title">Mot de passe pour le plugin VDR</string>
+ <string name="vdr_password_summary">Mot de passe pour le plugin VDR</string>
+ <string name="vdr_ssl_title">Connexion sécurisée</string>
+ <string name="vdr_ssl_summary">Utiliser SSL pour les connexions</string>
+ <string name="channel_filter_preferences">Paramètres des chaînes</string>
+ <string name="channel_filter_filter_title">Limitation pour les chaînes</string>
+ <string name="channel_filter_filter_summary">Utiliser uniquement les chaines données</string>
+ <string name="channel_filter_last_title">Filtrer chaîne</string>
+ <string name="channel_filter_last_summary">Séparer par une virgule les numéros de chaîne ou les intervalles (séparateur \'-\'). Ex: 1,2,4-10</string>
+ <string name="wakeup_preferences">Réveiller VDR à distance</string>
+ <string name="wakeup_enabled_title">Pouvoir réveiller à distance VDR</string>
+ <string name="wakeup_enabled_summary">Permettre de réveiller VDR à distance</string>
+ <string name="wakeup_url_title">URL pour le réveil à distance</string>
+ <string name="wakeup_url_summary">Requête pour l\'URL du réveil à distance</string>
+ <string name="wakeup_user_title">Nom de l’utilisateur pour le réveil</string>
+ <string name="wakeup_user_summary">Utilisateur pour le réveil à distance</string>
+ <string name="wakeup_password_title">Mot de passe pour le réveil à distance</string>
+ <string name="wakeup_password_summary">Mot de passe le réveil à distance</string>
+ <string name="wakeup_method_title">Méthode du réveil</string>
+ <string name="wakeup_method_summary">Choisir une méthode pour réveiller le VDR</string>
+ <string-array name="wakeup_methods">
+ <item>Appeler une URL</item>
+ <item>WOL</item>
+ </string-array>
+ <string name="wakeup_wol_custom_boradcast_title">Adresse IP de destination</string>
+ <string name="wakeup_wol_custom_boradcast_summary">À moins que vous n\'ayez une table ARP statique vous devriez utiliser une adresse de broadcast.</string>
+ <string name="wakeup_wol_mac_title">Adresse MAC</string>
+ <string name="wakeup_wol_mac_summary">Adresse MAC du hôte VDR. Utiliser \':\' ou \'-\' ou espace comme séparateur.</string>
+ <string name="timer_preferences">Programmation par défaut</string>
+ <string name="timer_pre_start_buffer_title">Marge de début</string>
+ <string name="timer_pre_start_buffer_summary">Minutes enregistrées avant le commencement de l\'émission</string>
+ <string name="timer_post_end_buffer_title">Marge de fin</string>
+ <string name="timer_post_end_buffer_summary">Minutes enregistrées en plus à la fin de l\'émission</string>
+ <string name="timer_default_priority_title">Priorité par défaut</string>
+ <string name="timer_default_priority_summary">Priorité par défaut</string>
+ <string name="timer_default_primary_limit_title">Limite principale par défaut</string>
+ <string name="timer_default_primary_limit_summary">Limite principale par défaut</string>
+ <string name="timer_default_lifetime_title">Durée de vie par défaut</string>
+ <string name="timer_default_lifetime_summary">Durée de vie par défaut</string>
+ <string name="gui_preferences">Paramètres GUI</string>
+ <string name="gui_enable_24h_format_title">Utiliser le format 24h</string>
+ <string name="gui_enable_24h_format_summary_on">13:00</string>
+ <string name="gui_enable_24h_format_summary_off">1:00 PM</string>
+ <string name="gui_channels_show_channel_numbers_title">Afficher le numéro des chaînes</string>
+ <string name="gui_channels_show_channel_numbers_summary">Afficher le numéro des chaînes dans la liste des chaînes.</string>
+ <string name="gui_quit_on_back_title">Quitter avec le bouton retour</string>
+ <string name="gui_quit_on_back_summary_on">Le bouton retour quitte VDR-Manager</string>
+ <string name="gui_quit_on_back_summary_off">Le bouton retour ne quitte pas VDR-Manager</string>
+ <string name="qui_show_imdb_button_title">Afficher le Bouton IMDb</string>
+ <string name="qui_show_imdb_button_summary_on">Le Bouton IMDb est affiché</string>
+ <string name="qui_show_imdb_button_summary_off">Le Bouton IMDb n\'est pas affiché</string>
+ <string name="qui_imdb_url_title">Site IMDb</string>
+ <string name="qui_imdb_url_summary">Quel site IMDb pour chercher.</string>
+ <string name="qui_show_omdb_button_title">Afficher le Bouton OMDB</string>
+ <string name="qui_show_omdb_button_summary_on">Le Bouton OMDB est affiché</string>
+ <string name="qui_show_omdb_button_summary_off">Le Bouton OMDB n\'est pas affiché</string>
+ <string name="qui_show_tmdb_button_title">Afficher le Bouton TMDb</string>
+ <string name="qui_show_tmdb_button_summary_on">Le Bouton TMDb est affiché</string>
+ <string name="qui_show_tmdb_button_summary_off">Le Bouton TMDb n\'est pas affiché</string>
+ <string name="gui_custom_locale_title">Personnaliser la langue</string>
+ <string name="gui_custom_locale_sum">Définir une langue personnalisée.</string>
+ <string-array name="imdb_urls">
+ <item>International</item>
+ <item>imdb.com</item>
+ <item>uk.imdb.com</item>
+ <item>imdb.de</item>
+ <item>imdb.es</item>
+ <item>imdb.fr</item>
+ <item>imdb.it</item>
+ <item>imdb.pt</item>
+ </string-array>
+ <string-array name="lang">
+ <item>Anglais</item>
+ <item>Allemand</item>
+ <item>Français</item>
+ <item>Italien</item>
+ <item>Ukrainien</item>
+ </string-array>
+ <string-array name="remux_entries">
+ <item>EXT</item>
+ <item>EXTERNE (déconseillé)</item>
+ </string-array>
+ <string name="vdr_advanced_preferences">Avancé</string>
+ <string name="vdr_advanced_preferences_summary">Paramètres avancés</string>
+ <string name="vdr_conntimeout_title">Délai de connexion expiré</string>
+ <string name="vdr_conntimeout_sum">Combien de temps à attendre (en secondes) avant d\'établir la connexion ?</string>
+ <string name="vdr_readtimeout_title">Délai de Lecture</string>
+ <string name="vdr_readtimeout_sum">Combien de temps à attendre (en secondes) avant l\'action de lecture en ligne ?</string>
+ <string name="vdr_timeout_title">Total pour l\'expiration</string>
+ <string name="vdr_timeout_sum">Combien de temps à attendre (en secondes) avant d\'abandonner toutes les opérations I/O ?</string>
+ <string name="streaming_password_title">Mot de passe pour Streamdev</string>
+ <string name="streaming_password_sum">Ajouter votre mot passe pour streamdev. (ex: -a \'utilisateur:mot_de_passe\')</string>
+ <string name="streaming_username_title">Utilisateur Streamdev</string>
+ <string name="streaming_username_sum">Ajouter votre utilisateur pour streamdev. (ex: -a \'utilisateur:mot_de_passe\')</string>
+ <string name="vdr_encoding_title">Encodage des caractères</string>
+ <string name="vdr_encoding_summary">Encodage des caractères de votre VDR. Par défaut utf-8.</string>
+ <string name="new_vdr">Nouveau VDR</string>
+ <string name="no_vdr">Aucun équipement VDR</string>
+ <string name="vdr_devices_category">Équipements VDR</string>
+ <string name="vdr_prefs_category">Appareil</string>
+ <string name="vdr_name_title">Nom</string>
+ <string name="vdr_name_summary">Un nom pour cet équipement</string>
+ <string name="vdr_device_delete_qeustion">Supprimer cet équipement ?</string>
+ <string name="recstream">Diffusion en streaming des enregistrements</string>
+ <string name="recstream_enable_title">Streaming des enregistrements</string>
+ <string name="recstream_enable_summary">Autoriser le streaming des enregistrements</string>
+ <string-array name="recstream_entries">
+ <item>Plugin live</item>
+ <item>Plugin streamdev</item>
+ <item>plugin smarttvweb</item>
+ </string-array>
+ <string-array name="recstream_smarttvweb_entries">
+ <item>Progressif</item>
+ <item>MPEG-DASH</item>
+ <item>Apple HLS</item>
+ </string-array>
+ <string name="recstream_method_title">Méthode pour le streaming</string>
+ <string name="recstream_method_summary">Actuellement le Streaming par VDR live et ou le plugin streamdev est supporté</string>
+ <string name="settings_live_port">Port pour le plugin VDR live</string>
+ <string name="settings_live_port_summary">Le port par défaut pour le plugin VDR live est 8008.</string>
+ <string name="progress_connect">Connexion&#8230;</string>
+ <string name="progress_connect_error">Échec de connexion !</string>
+ <string name="progress_connect_timeout">Connexion expirée !</string>
+ <string name="progress_login">Identifiant.</string>
+ <string name="progress_login_error">Échec de connexion.</string>
+ <string name="progress_whatson_loading">Chargement des données EPG&#8230;</string>
+ <string name="progress_timers_loading">Chargement des programmations&#8230;</string>
+ <string name="progress_recordings_loading">Chargement des enregistrements&#8230;</string>
+ <string name="progress_switching">Changement&#8230;</string>
+ <string name="progress_channels_loading">Chargement des chaînes&#8230;</string>
+ <string name="progress_loading">Chargement&#8230;</string>
+ <string name="progress_disconnect">Déconnecter&#8230;</string>
+ <string name="progress_wakeup_sending">Initialisation d\'une requête pour le réveil&#8230;</string>
+ <string name="progress_wakeup_sent">Requête du réveil envoyée</string>
+ <string name="progress_wakeup_error">Erreur à l\'envoi de la requête du réveil : %1$s</string>
+ <string name="progress_timer_save">Sauvegarde de la programmation&#8230;</string>
+ <string name="progress_timer_delete">Supprimer la programmation&#8230;</string>
+ <string name="progress_recording_delete">Supprimer l\'enregistrement&#8230;</string>
+ <string name="progress_timer_enable">Activer la programmation&#8230;</string>
+ <string name="progress_timer_modify">Mise à jour de la programmation&#8230;</string>
+ <string name="progress_timer_disable">Désactiver la programmation&#8230;</string>
+ <string name="progress_connect_finished_abnormal">La connexion s\'est terminée anormalement</string>
+ <string name="progress_connect_finished_abnormal_arg">La connexion s\'est terminée anormalement : %1$s</string>
+ <string name="progress_cache_hit">Chargement depuis le cache.</string>
+ <string name="recording_item_menu_delete">Supprimer</string>
+ <string name="recording_item_menu_stream">Flux</string>
+ <string name="recent_channels">Chaînes récentes</string>
+ <string name="recent_channels_no_history">Pas d’historique&#8230;</string>
+ <string name="gui_max_recent_channels_title">Chaînes récentes Max</string>
+ <string name="gui_max_recent_channels_summary">Combien de chaines voulez-vous garder dans les chaînes récentes ?</string>
+ <string name="timer_detail_day_title">Jour</string>
+ <string name="every_day">Tous les jours</string>
+ <string name="never">Jamais</string>
+ <string name="day_concat">","</string>
+ <string name="timer_detail_repeat_title">Répéter</string>
+ <string name="timer_detail_use_vps">Utiliser VPS :</string>
+ <string name="timer_detail_priority">Priorité :</string>
+ <string name="timer_detail_lifetime">Durée de vie :</string>
+ <string name="timer_detail_lifetime_hint">Ex: 99</string>
+ <string name="timer_detail_priority_hint">Ex: 50</string>
+ <string name="timer_detail_title_vps">%1$s (VPS)</string>
+ <string name="channel_item_menu_switch">Basculer vers</string>
+ <string name="switching_success">Basculer vers %s</string>
+ <string name="switching_failed">Basculer vers %1$s raté : %2$s</string>
+ <string name="switch_to_channel">Basculer vers</string>
+ <string name="sort">Trier</string>
+ <string name="sortby">Trier par</string>
+ <string name="sortby_time">Heure</string>
+ <string name="sortby_channel">Chaîne</string>
+ <string name="sortby_alphabet">Alphabet</string>
+ <string name="sortby_channellist">Liste des chaînes</string>
+ <string name="main_menu_clear_search">Effacer l\'historique de recherche</string>
+ <string name="vdr_host_not_defined">Le hôte VDR n\'est pas défini</string>
+ <string name="processing">Traitement&#8230;</string>
+ <string-array name="recent_channels_order_entries">
+ <item>Couramment utilisé</item>
+ <item>Dernier utilisé</item>
+ </string-array>
+ <string-array name="epg_sort_by_time_alpha">
+ <item>Heure</item>
+ <item>Alphabet</item>
+ </string-array>
+ <string-array name="epg_sort_by_time_alpha_channel">
+ <item>Heure</item>
+ <item>Alphabet</item>
+ <item>Chaîne</item>
+ </string-array>
+ <string-array name="epg_sort_by_channels_alpha">
+ <item>Chaînes</item>
+ <item>Alphabet</item>
+ </string-array>
+ <string-array name="recordings_group_by">
+ <item>Par heure</item>
+ <item>Par ordre alphabétique</item>
+ </string-array>
+ <string name="gui_recent_channels_order_summary">Classement par le plus utilisé ou le plus souvent utilisé</string>
+ <string name="gui_recent_channels_order_title">Classement des chaînes récentes</string>
+ <string-array name="channels_group_by">
+ <item>Groupe</item>
+ <item>Fournisseur</item>
+ <item>Source</item>
+ <item>Nom</item>
+ </string-array>
+ <string-array name="navigation_array">
+ <item>Chaînes</item>
+ <item>EPG par heure</item>
+ <item>EPG par Chaîne</item>
+ <item>Enregistrements</item>
+ <item>Enregistrements</item>
+ </string-array>
+ <string name="filter">Filtre</string>
+ <string name="audio_tracks_template">Pistes audio : %1$s</string>
+ <string name="audio_track_dolby">D</string>
+ <string name="vdr_timezone_summary">Fuseau horaire utilisé pour le serveur. Ceci est important sur vous voyagez que vous modifiez l\'enregistrement depuis un autre fuseau horaire.</string>
+ <string name="vdr_timezone_title">Sélectionner le fuseau horaire du serveur</string>
+ <string name="zone_list_menu_sort_alphabetically">Trier par ordre alphabétique</string>
+ <string name="zone_list_menu_sort_by_timezone">Trier par fuseau horaire</string>
+ <string name="probing">Examiner %1$s &#8230;</string>
+ <string name="no_results">Pas de résultat&#8230;</string>
+ <string name="recording_started">L\'enregistrement a commencé</string>
+ <string name="set_time">Définir l\'heure</string>
+ <string name="certificate_problem_message_title">Avertissement du certificat</string>
+ <string name="certificate_problem_message_text">Le certificat n\'a pas été accepté:\n\n
+Nom d\'hôte:\n
+ %1$s\n
+Valide depuis le:\n
+ %2$s\n
+Valide jusqu\'au:\n
+ %3$s\n\n
+Que voulez-vous faire?</string>
+ <string name="certificate_accept_once">Accepter une fois</string>
+ <string name="certificate_accepted_forever">Toujours accepter</string>
+ <string name="certificate_not_accepted">Abandonner</string>
+ <string name="Content$Movie__Drama">Film/Dramatique</string>
+ <string name="Content$Detective__Thriller">Détectives/Polar</string>
+ <string name="Content$Adventure__Western__War">Aventure/Western/Guerre</string>
+ <string name="Content$Science_Fiction__Fantasy__Horror">Science Fiction/Fantaisie/Horreur</string>
+ <string name="Content$Comedy">Comédie</string>
+ <string name="Content$Soap__Melodrama__Folkloric">Feuilleton/Mélodrame/Folklorique</string>
+ <string name="Content$Romance">Romance</string>
+ <string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Sérieux/Classique/Religieux/Film Historique/Drame</string>
+ <string name="Content$Adult_Movie__Drama">Film pour adultes/Drame</string>
+ <string name="Content$News__Current_Affairs">Informations/Actualités</string>
+ <string name="Content$News__Weather_Report">Informations/Météo</string>
+ <string name="Content$News_Magazine">Magazine d\'information</string>
+ <string name="Content$Documentary">Documentaire</string>
+ <string name="Content$Discussion__Inverview__Debate">Discussion/Interview/Débat</string>
+ <string name="Content$Show__Game_Show">Spectacle/Jeu Télévisé</string>
+ <string name="Content$Game_Show__Quiz__Contest">Jeu Télévisé/Quiz/Concours</string>
+ <string name="Content$Variety_Show">Spectacle de variétés</string>
+ <string name="Content$Talk_Show">Débat télévisé</string>
+ <string name="Content$Sports">Sports</string>
+ <string name="Content$Special_Event">Évènement spécial</string>
+ <string name="Content$Sport_Magazine">Magazine sportif</string>
+ <string name="Content$Football__Soccer">Football/Foot</string>
+ <string name="Content$Tennis__Squash">Tennis/Squash</string>
+ <string name="Content$Team_Sports">Sports d\'équipe</string>
+ <string name="Content$Athletics">Sports d\'équipe</string>
+ <string name="Content$Motor_Sport">Sports mécaniques</string>
+ <string name="Content$Water_Sport">Sports nautiques</string>
+ <string name="Content$Winter_Sports">Sports d\'hiver</string>
+ <string name="Content$Equestrian">Équitation</string>
+ <string name="Content$Martial_Sports">Sports de combat</string>
+ <string name="Content$Childrens__Youth_Programme">Enfant/Programme jeunesse</string>
+ <string name="Content$Preschool_Childrens_Programme">Programme pour les enfants d\'âge préscolaire</string>
+ <string name="Content$Entertainment_Programme_for_6_to_14">Programme de divertissement pour les 6-14 ans</string>
+ <string name="Content$Entertainment_Programme_for_10_to_16">Programme de divertissement pour les 10 - 16 ans</string>
+ <string name="Content$Informational__Educational__School_Programme">Informationnel/Éducatif/Programme Scolaire</string>
+ <string name="Content$Cartoons__Puppets">Dessins animés/Marionnettes</string>
+ <string name="Content$Music__Ballet__Dance">Musique/Ballet/Danse</string>
+ <string name="Content$Rock__Pop">Rock/Pop</string>
+ <string name="Content$Serious__Classical_Music">Sérieux/Musique Classique</string>
+ <string name="Content$Folk__Tradional_Music">Folk/Musique Traditionnelle</string>
+ <string name="Content$Jazz">Jazz</string>
+ <string name="Content$Musical__Opera">Comédie Musicale/Opéra</string>
+ <string name="Content$Ballet">Ballet</string>
+ <string name="Content$Arts__Culture">Arts/Culture</string>
+ <string name="Content$Performing_Arts">Performances artistiques</string>
+ <string name="Content$Fine_Arts">Beaux Arts</string>
+ <string name="Content$Religion">Religion</string>
+ <string name="Content$Popular_Culture__Traditional_Arts">Culture Populaire/Arts Traditionnels</string>
+ <string name="Content$Literature">Littérature</string>
+ <string name="Content$Film__Cinema">Film/Cinéma</string>
+ <string name="Content$Experimental_Film__Video">Film Expérimental/Vidéo</string>
+ <string name="Content$Broadcasting__Press">Télédiffusion/Presse</string>
+ <string name="Content$New_Media">Nouveau Média</string>
+ <string name="Content$Arts__Culture_Magazine">Arts/Magazine Culturel</string>
+ <string name="Content$Fashion">Mode</string>
+ <string name="Content$Social__Political__Economics">Société/Politique/Économie</string>
+ <string name="Content$Magazine__Report__Documentary">Magazine/Reportage/Documentaire</string>
+ <string name="Content$Economics__Social_Advisory">Économie/Reportage de Société</string>
+ <string name="Content$Remarkable_People">Personnalités</string>
+ <string name="Content$Education__Science__Factual">Éducation/Science/Factuel</string>
+ <string name="Content$Nature__Animals__Environment">Nature/Animaux/Environnement</string>
+ <string name="Content$Technology__Natural_Sciences">Technologie/Sciences Naturelles</string>
+ <string name="Content$Medicine__Physiology__Psychology">Médecine/Physiologie/Psychologie</string>
+ <string name="Content$Foreign_Countries__Expeditions">Pays Étrangers/Expéditions</string>
+ <string name="Content$Social__Spiritual_Sciences">Société/Sciences Spirituelles</string>
+ <string name="Content$Further_Education">Formation Continue</string>
+ <string name="Content$Languages">Langages</string>
+ <string name="Content$Leisure__Hobbies">Loisir/Passe temps</string>
+ <string name="Content$Tourism__Travel">Tourisme/Voyage</string>
+ <string name="Content$Handicraft">Artisanat</string>
+ <string name="Content$Motoring">Automobilisme</string>
+ <string name="Content$Fitness_and_Health">Forme &amp; Santé</string>
+ <string name="Content$Cooking">Cuisine</string>
+ <string name="Content$Advertisement__Shopping">Publicité/Téléachat</string>
+ <string name="Content$Gardening">Jardinage</string>
+ <string name="Content$Original_Language">Version originale</string>
+ <string name="Content$Black_and_White">Noir &amp; Blanc</string>
+ <string name="Content$Unpublished">Inédit</string>
+ <string name="Content$Live_Broadcast">Direct</string>
+ <string name="type_to_filter">Type de filtre</string>
+ <string name="drive_info">Libre %1$s Go of %2$s Go (%3$s%%)</string>
+ <string name="drive_img">Disque</string>
+ <string name="sad_img">Triste</string>
+ <string name="search">Rechercher</string>
+ <string name="clear_term_after_search_title">Effacer les Termes après Recherche</string>
+ <string name="clear_term_after_search_summary_off">Garder les termes après la recherche</string>
+ <string name="clear_term_after_search_summary_on">Effacer les termes après la recherche</string>
+ <string name="drawer_open">Ouvrir panneau coulissant</string>
+ <string name="drawer_close">Fermer le panneau coulissant de navigation</string>
+ <string name="action_websearch">Recherche Web</string>
+ <string name="settings_smarttvweb_port_summary">Plugin VDR smarttvweb a le port 8000 par défaut</string>
+ <string name="settings_smarttvweb_port">Port Smarttvweb</string>
+ <string name="recstream_smarttvweb_method_title">Type de streaming pour Smarttvweb</string>
+ <string name="recstream_smarttvweb_method_summary">Méthode supportées : \'Progressive\', \'MPEG-DASH \/ OIPF HAS\', \'Apple HLS\'</string>
+ <string name="remote">Télécommande</string>
+ <string name="remote_enable_summary">Afficher la télécommande si activée</string>
+ <string name="remote_enable_title">Activer la télécommande de VDR</string>
+ <string name="svdrp_port_title">Port DVDRP</string>
+ <string name="svdrp_port_summary">Par défaut le 6419</string>
+</resources>
diff --git a/vdrmanager/app/src/main/res/values-fr/timers.xml b/vdrmanager/app/src/main/res/values-fr/timers.xml
new file mode 100644
index 0000000..f789f9a
--- /dev/null
+++ b/vdrmanager/app/src/main/res/values-fr/timers.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+ <string name="timer_detail_title_title">Titre :</string>
+ <string name="timer_detail_channel_title">Chaîne :</string>
+ <string name="timer_detail_start_title">Début :</string>
+ <string name="timer_detail_end_title">Fin :</string>
+ <string name="timer_details_create_title">Créer une programmation</string>
+ <string name="timer_details_save_title">Sauvegarder les changements</string>
+ <string name="timer_details_delete_title">Supprimer la programmation</string>
+ <string name="timer_details_add_title">Créer une nouvelle programmation</string>
+ <string name="timer_details_modify_title">Modifier la programmation</string>
+</resources>
diff --git a/vdrmanager/build/intermediates/dex-cache/cache.xml b/vdrmanager/build/intermediates/dex-cache/cache.xml
index dddc43f..4d848d6 100644
--- a/vdrmanager/build/intermediates/dex-cache/cache.xml
+++ b/vdrmanager/build/intermediates/dex-cache/cache.xml
@@ -2,60 +2,60 @@
<items version="2" >
<item
- jar="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar"
jumboMode="false"
revision="22.0.1"
- sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-d707f71375a78f647fb59424f7cb18d5bb6767ff.jar" />
+ sha1="3499ceba05ca1f6037c6a2fad73df8f636224a28">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-df270354a468f494c80ff7db6414859872a1cdc5.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-core-4.47.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/slf4j-android-1.6.1-RC1.jar"
jumboMode="false"
revision="22.0.1"
- sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-core-4.47-f4351fd8956d1b69c8e44b91acc06d6bd235d5f2.jar" />
+ sha1="a0b527e8aabcc1f1e97d1674dc3f4f0794ec5df1">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/slf4j-android-1.6.1-RC1-f6bdb9b40f113bad4847688d0617ca1ece7cb7ac.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/svdrp4j-1.1.0-SNAPSHOT.jar"
jumboMode="false"
revision="22.0.1"
- sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-645be6d760595dd3c5cc9b37064967e8925d69e4.jar" />
+ sha1="ab78bd1a6dddd90492477dc828583d298cfc173c">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/svdrp4j-1.1.0-SNAPSHOT-9aad1a4ae5633d9645273a17693384af69d9c05a.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/slf4j-android-1.6.1-RC1.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar"
jumboMode="false"
revision="22.0.1"
- sha1="a0b527e8aabcc1f1e97d1674dc3f4f0794ec5df1">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/slf4j-android-1.6.1-RC1-f6bdb9b40f113bad4847688d0617ca1ece7cb7ac.jar" />
+ sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-dd9d53acfa94b9d3ce7c22e7af21024539551df4.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar"
+ jar="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar"
jumboMode="false"
revision="22.0.1"
- sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-dd9d53acfa94b9d3ce7c22e7af21024539551df4.jar" />
+ sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-d707f71375a78f647fb59424f7cb18d5bb6767ff.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar"
jumboMode="false"
revision="22.0.1"
- sha1="3499ceba05ca1f6037c6a2fad73df8f636224a28">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-df270354a468f494c80ff7db6414859872a1cdc5.jar" />
+ sha1="c72f9ed54d8a8bab3fbf56da2b358308a67899a4">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-android-4.47-cd582e76513b150a799d72777f8ce54c8cef042c.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/svdrp4j-1.1.0-SNAPSHOT.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-core-4.47.jar"
jumboMode="false"
revision="22.0.1"
- sha1="ab78bd1a6dddd90492477dc828583d298cfc173c">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/svdrp4j-1.1.0-SNAPSHOT-9aad1a4ae5633d9645273a17693384af69d9c05a.jar" />
+ sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-core-4.47-f4351fd8956d1b69c8e44b91acc06d6bd235d5f2.jar" />
</item>
<item
- jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar"
+ jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar"
jumboMode="false"
revision="22.0.1"
- sha1="c72f9ed54d8a8bab3fbf56da2b358308a67899a4">
- <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-android-4.47-cd582e76513b150a799d72777f8ce54c8cef042c.jar" />
+ sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03">
+ <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-645be6d760595dd3c5cc9b37064967e8925d69e4.jar" />
</item>
</items>