Merge lp:~trb143/openlp/Android2-a4 into lp:openlp/android2
- Android2-a4
- Merge into android2
Proposed by
Tim Bentley
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp:~trb143/openlp/Android2-a4 |
Merge into: | lp:openlp/android2 |
Diff against target: |
2116 lines (+711/-411) 51 files modified
OpenLP2.iml (+1/-1) app/app.iml (+21/-16) app/build.gradle (+14/-3) app/src/androidTest/java/org/openlp/android2/ApplicationTest.java (+0/-13) app/src/main/java/org/openlp/android2/OpenLP.java (+26/-3) app/src/main/java/org/openlp/android2/activities/SettingsActivity.java (+1/-2) app/src/main/java/org/openlp/android2/common/OpenLPFragment.java (+11/-0) app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java (+4/-4) app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java (+31/-24) app/src/main/java/org/openlp/android2/fragments/AboutFragment.java (+1/-1) app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java (+9/-1) app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java (+10/-1) app/src/main/res/drawable/customborder.xml (+3/-2) app/src/main/res/layout/activity_main.xml (+53/-25) app/src/main/res/layout/blank_display_dialog.xml (+4/-6) app/src/main/res/layout/fragment_livelist_list.xml (+4/-3) app/src/main/res/values-cs/strings.xml (+10/-6) app/src/main/res/values-da/strings.xml (+15/-1) app/src/main/res/values-de/strings.xml (+31/-1) app/src/main/res/values-en-rGB/strings.xml (+11/-7) app/src/main/res/values-en-rZA/strings.xml (+57/-0) app/src/main/res/values-en_rZA/strings.xml (+0/-53) app/src/main/res/values-es/strings.xml (+16/-4) app/src/main/res/values-et/strings.xml (+29/-1) app/src/main/res/values-fi/strings.xml (+16/-12) app/src/main/res/values-hu/strings.xml (+10/-6) app/src/main/res/values-id/strings.xml (+7/-7) app/src/main/res/values-ko_rKR/strings.xml (+0/-9) app/src/main/res/values-lt/strings.xml (+14/-6) app/src/main/res/values-nb/strings.xml (+11/-7) app/src/main/res/values-nl/strings.xml (+9/-5) app/src/main/res/values-pl/strings.xml (+33/-6) app/src/main/res/values-pt-rBR/strings.xml (+52/-0) app/src/main/res/values-pt_rBR/strings.xml (+0/-25) app/src/main/res/values-ro/strings.xml (+47/-0) app/src/main/res/values-ru/strings.xml (+1/-1) app/src/main/res/values-sk/strings.xml (+11/-7) app/src/main/res/values-sv/strings.xml (+13/-6) app/src/main/res/values-ta_rLK/strings.xml (+0/-24) app/src/main/res/values-th_rTH/strings.xml (+0/-24) app/src/main/res/values-uk/strings.xml (+47/-0) app/src/main/res/values-vi_rVN/strings.xml (+0/-2) app/src/main/res/values-zh-rTW/strings.xml (+57/-0) app/src/main/res/values-zh_rCN/strings.xml (+0/-24) app/src/main/res/values-zh_rTW/strings.xml (+0/-53) app/src/main/res/values/defaultValues.xml (+1/-0) app/src/main/res/values/keyStrings.xml (+1/-0) app/src/main/res/values/strings.xml (+11/-7) app/src/main/res/xml/pref_general.xml (+6/-0) app/src/main/res/xml/pref_headers.xml (+1/-1) build.gradle (+1/-1) |
To merge this branch: | bzr merge lp:~trb143/openlp/Android2-a4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Approve | ||
Review via email: mp+274768@code.launchpad.net |
Commit message
Description of the change
Update Translations and build number
To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'OpenLP2.iml' | |||
2 | --- OpenLP2.iml 2015-04-11 11:12:51 +0000 | |||
3 | +++ OpenLP2.iml 2015-10-16 19:35:50 +0000 | |||
4 | @@ -8,7 +8,7 @@ | |||
5 | 8 | </configuration> | 8 | </configuration> |
6 | 9 | </facet> | 9 | </facet> |
7 | 10 | </component> | 10 | </component> |
9 | 11 | <component name="NewModuleRootManager" inherit-compiler-output="true"> | 11 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> |
10 | 12 | <exclude-output /> | 12 | <exclude-output /> |
11 | 13 | <content url="file://$MODULE_DIR$"> | 13 | <content url="file://$MODULE_DIR$"> |
12 | 14 | <excludeFolder url="file://$MODULE_DIR$/.gradle" /> | 14 | <excludeFolder url="file://$MODULE_DIR$/.gradle" /> |
13 | 15 | 15 | ||
14 | === modified file 'app/app.iml' | |||
15 | --- app/app.iml 2015-05-30 08:07:36 +0000 | |||
16 | +++ app/app.iml 2015-10-16 19:35:50 +0000 | |||
17 | @@ -12,10 +12,12 @@ | |||
18 | 12 | <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> | 12 | <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> |
19 | 13 | <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> | 13 | <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> |
20 | 14 | <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> | 14 | <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> |
25 | 15 | <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> | 15 | <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> |
26 | 16 | <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> | 16 | <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> |
27 | 17 | <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" /> | 17 | <afterSyncTasks> |
28 | 18 | <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" /> | 18 | <task>generateDebugAndroidTestSources</task> |
29 | 19 | <task>generateDebugSources</task> | ||
30 | 20 | </afterSyncTasks> | ||
31 | 19 | <option name="ALLOW_USER_CONFIGURATION" value="false" /> | 21 | <option name="ALLOW_USER_CONFIGURATION" value="false" /> |
32 | 20 | <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> | 22 | <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> |
33 | 21 | <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> | 23 | <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> |
34 | @@ -24,9 +26,9 @@ | |||
35 | 24 | </configuration> | 26 | </configuration> |
36 | 25 | </facet> | 27 | </facet> |
37 | 26 | </component> | 28 | </component> |
39 | 27 | <component name="NewModuleRootManager" inherit-compiler-output="false"> | 29 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> |
40 | 28 | <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> | 30 | <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> |
42 | 29 | <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> | 31 | <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> |
43 | 30 | <exclude-output /> | 32 | <exclude-output /> |
44 | 31 | <content url="file://$MODULE_DIR$"> | 33 | <content url="file://$MODULE_DIR$"> |
45 | 32 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> | 34 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> |
46 | @@ -35,12 +37,12 @@ | |||
47 | 35 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> | 37 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> |
48 | 36 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> | 38 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> |
49 | 37 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> | 39 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> |
56 | 38 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" /> | 40 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> |
57 | 39 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" /> | 41 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> |
58 | 40 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" /> | 42 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> |
59 | 41 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" /> | 43 | <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> |
60 | 42 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" /> | 44 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> |
61 | 43 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" /> | 45 | <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" /> |
62 | 44 | <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> | 46 | <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> |
63 | 45 | <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> | 47 | <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> |
64 | 46 | <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> | 48 | <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> |
65 | @@ -69,6 +71,9 @@ | |||
66 | 69 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> | 71 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> |
67 | 70 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> | 72 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> |
68 | 71 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> | 73 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> |
69 | 74 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" /> | ||
70 | 75 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" /> | ||
71 | 76 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" /> | ||
72 | 72 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> | 77 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> |
73 | 73 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> | 78 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> |
74 | 74 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> | 79 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> |
75 | @@ -82,13 +87,13 @@ | |||
76 | 82 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> | 87 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> |
77 | 83 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> | 88 | <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> |
78 | 84 | <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> | 89 | <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> |
79 | 85 | <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> | ||
80 | 86 | </content> | 90 | </content> |
81 | 87 | <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> | 91 | <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> |
82 | 88 | <orderEntry type="sourceFolder" forTests="false" /> | 92 | <orderEntry type="sourceFolder" forTests="false" /> |
83 | 93 | <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" /> | ||
84 | 89 | <orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" /> | 94 | <orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" /> |
88 | 90 | <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" /> | 95 | <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" /> |
89 | 91 | <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" /> | 96 | <orderEntry type="library" exported="" name="design-22.2.1" level="project" /> |
90 | 92 | <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" /> | 97 | <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" /> |
91 | 93 | </component> | 98 | </component> |
92 | 94 | </module> | 99 | </module> |
93 | 95 | \ No newline at end of file | 100 | \ No newline at end of file |
94 | 96 | 101 | ||
95 | === modified file 'app/build.gradle' | |||
96 | --- app/build.gradle 2015-05-30 08:07:36 +0000 | |||
97 | +++ app/build.gradle 2015-10-16 19:35:50 +0000 | |||
98 | @@ -10,7 +10,7 @@ | |||
99 | 10 | applicationId "org.openlp.android2" | 10 | applicationId "org.openlp.android2" |
100 | 11 | minSdkVersion 15 | 11 | minSdkVersion 15 |
101 | 12 | targetSdkVersion 22 | 12 | targetSdkVersion 22 |
103 | 13 | versionCode 2 | 13 | versionCode 4 |
104 | 14 | versionName "2.0" | 14 | versionName "2.0" |
105 | 15 | } | 15 | } |
106 | 16 | android { | 16 | android { |
107 | @@ -24,11 +24,22 @@ | |||
108 | 24 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | 24 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' |
109 | 25 | } | 25 | } |
110 | 26 | } | 26 | } |
111 | 27 | testOptions { | ||
112 | 28 | unitTests.returnDefaultValues = true | ||
113 | 27 | } | 29 | } |
114 | 28 | 30 | ||
115 | 29 | dependencies { | 31 | dependencies { |
116 | 30 | compile fileTree(include: ['*.jar'], dir: 'libs') | 32 | compile fileTree(include: ['*.jar'], dir: 'libs') |
119 | 31 | compile 'com.android.support:appcompat-v7:22.2.0' | 33 | compile 'com.android.support:appcompat-v7:22.2.1' |
120 | 32 | compile 'com.android.support:support-v4:22.2.0' | 34 | compile 'com.android.support:support-v4:22.2.1' |
121 | 35 | compile 'com.android.support:design:22.2.1' | ||
122 | 33 | compile 'com.loopj.android:android-async-http:1.4.6' | 36 | compile 'com.loopj.android:android-async-http:1.4.6' |
123 | 37 | testCompile 'junit:junit:4.12' | ||
124 | 38 | testCompile 'org.easytesting:fest:1.0.16' | ||
125 | 39 | testCompile 'com.squareup:fest-android:1.0.8' | ||
126 | 40 | testCompile('org.robolectric:robolectric:3.0-rc2') { | ||
127 | 41 | exclude group: 'commons-logging', module: 'commons-logging' | ||
128 | 42 | exclude group: 'org.apache.httpcomponents', module: 'httpclient' | ||
129 | 43 | } | ||
130 | 34 | } | 44 | } |
131 | 45 | } | ||
132 | 35 | \ No newline at end of file | 46 | \ No newline at end of file |
133 | 36 | 47 | ||
134 | === removed directory 'app/src/androidTest/java/org' | |||
135 | === removed directory 'app/src/androidTest/java/org/openlp' | |||
136 | === removed directory 'app/src/androidTest/java/org/openlp/android2' | |||
137 | === removed file 'app/src/androidTest/java/org/openlp/android2/ApplicationTest.java' | |||
138 | --- app/src/androidTest/java/org/openlp/android2/ApplicationTest.java 2014-11-14 16:34:14 +0000 | |||
139 | +++ app/src/androidTest/java/org/openlp/android2/ApplicationTest.java 1970-01-01 00:00:00 +0000 | |||
140 | @@ -1,13 +0,0 @@ | |||
141 | 1 | package org.openlp.android2; | ||
142 | 2 | |||
143 | 3 | import android.app.Application; | ||
144 | 4 | import android.test.ApplicationTestCase; | ||
145 | 5 | |||
146 | 6 | /** | ||
147 | 7 | * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a> | ||
148 | 8 | */ | ||
149 | 9 | public class ApplicationTest extends ApplicationTestCase<Application> { | ||
150 | 10 | public ApplicationTest() { | ||
151 | 11 | super(Application.class); | ||
152 | 12 | } | ||
153 | 13 | } | ||
154 | 14 | \ No newline at end of file | 0 | \ No newline at end of file |
155 | 15 | 1 | ||
156 | === modified file 'app/src/main/java/org/openlp/android2/OpenLP.java' | |||
157 | --- app/src/main/java/org/openlp/android2/OpenLP.java 2015-05-29 20:47:42 +0000 | |||
158 | +++ app/src/main/java/org/openlp/android2/OpenLP.java 2015-10-16 19:35:50 +0000 | |||
159 | @@ -31,6 +31,7 @@ | |||
160 | 31 | import android.view.MenuItem; | 31 | import android.view.MenuItem; |
161 | 32 | import android.view.View; | 32 | import android.view.View; |
162 | 33 | import android.support.v4.widget.DrawerLayout; | 33 | import android.support.v4.widget.DrawerLayout; |
163 | 34 | import android.view.WindowManager; | ||
164 | 34 | 35 | ||
165 | 35 | import org.openlp.android2.activities.SettingsActivity; | 36 | import org.openlp.android2.activities.SettingsActivity; |
166 | 36 | import org.openlp.android2.common.NavigationOptions; | 37 | import org.openlp.android2.common.NavigationOptions; |
167 | @@ -74,13 +75,15 @@ | |||
168 | 74 | mNavigationDrawerFragment.setUp( | 75 | mNavigationDrawerFragment.setUp( |
169 | 75 | R.id.navigation_drawer, | 76 | R.id.navigation_drawer, |
170 | 76 | (DrawerLayout) findViewById(R.id.drawer_layout)); | 77 | (DrawerLayout) findViewById(R.id.drawer_layout)); |
171 | 78 | |||
172 | 79 | getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); | ||
173 | 77 | } | 80 | } |
174 | 78 | 81 | ||
175 | 79 | /** | 82 | /** |
176 | 80 | * Check the preferences have been set at startup and if not redirect them to be set. | 83 | * Check the preferences have been set at startup and if not redirect them to be set. |
177 | 81 | * | 84 | * |
178 | 82 | */ | 85 | */ |
180 | 83 | private void doPreferenceCheck() { | 86 | protected void doPreferenceCheck() { |
181 | 84 | SharedPreferences sharedPrefs = PreferenceManager | 87 | SharedPreferences sharedPrefs = PreferenceManager |
182 | 85 | .getDefaultSharedPreferences(this); | 88 | .getDefaultSharedPreferences(this); |
183 | 86 | if (sharedPrefs.getString(getString(R.string.key_host), "NONE").equals("NONE") | 89 | if (sharedPrefs.getString(getString(R.string.key_host), "NONE").equals("NONE") |
184 | @@ -118,23 +121,29 @@ | |||
185 | 118 | .replace(R.id.container, HomeFragment.newInstance()) | 121 | .replace(R.id.container, HomeFragment.newInstance()) |
186 | 119 | .commit(); | 122 | .commit(); |
187 | 120 | mTitle = getString(R.string.home); | 123 | mTitle = getString(R.string.home); |
188 | 124 | toggerContainer(R.id.next_button, View.GONE); | ||
189 | 125 | toggerContainer(R.id.prev_button, View.GONE); | ||
190 | 121 | break; | 126 | break; |
191 | 122 | case NavigationOptions.ServiceList: | 127 | case NavigationOptions.ServiceList: |
192 | 123 | singleTab(); | 128 | singleTab(); |
193 | 124 | fragmentManager.beginTransaction() | 129 | fragmentManager.beginTransaction() |
195 | 125 | .replace(R.id.container, ServiceListFragment.newInstance()) | 130 | .replace(R.id.container, ServiceListFragment.newInstance(), "servicelist") |
196 | 126 | .commit(); | 131 | .commit(); |
197 | 127 | mTitle = getString(R.string.service_list); | 132 | mTitle = getString(R.string.service_list); |
198 | 133 | toggerContainer(R.id.next_button, View.VISIBLE); | ||
199 | 134 | toggerContainer(R.id.prev_button, View.VISIBLE); | ||
200 | 128 | break; | 135 | break; |
201 | 129 | case NavigationOptions.LiveList: | 136 | case NavigationOptions.LiveList: |
202 | 130 | duelTab(); | 137 | duelTab(); |
203 | 131 | fragmentManager.beginTransaction() | 138 | fragmentManager.beginTransaction() |
205 | 132 | .replace(R.id.container_left, ServiceListFragment.newInstance()) | 139 | .replace(R.id.container_left, ServiceListFragment.newInstance(), "servicelist") |
206 | 133 | .commit(); | 140 | .commit(); |
207 | 134 | fragmentManager.beginTransaction() | 141 | fragmentManager.beginTransaction() |
208 | 135 | .replace(R.id.container_right, LiveListFragment.newInstance()) | 142 | .replace(R.id.container_right, LiveListFragment.newInstance()) |
209 | 136 | .commit(); | 143 | .commit(); |
210 | 137 | mTitle = getString(R.string.live_list); | 144 | mTitle = getString(R.string.live_list); |
211 | 145 | toggerContainer(R.id.next_button, View.VISIBLE); | ||
212 | 146 | toggerContainer(R.id.prev_button, View.VISIBLE); | ||
213 | 138 | break; | 147 | break; |
214 | 139 | case NavigationOptions.StageView: | 148 | case NavigationOptions.StageView: |
215 | 140 | singleTab(); | 149 | singleTab(); |
216 | @@ -142,6 +151,8 @@ | |||
217 | 142 | .replace(R.id.container, StageWebFragment.newInstance()) | 151 | .replace(R.id.container, StageWebFragment.newInstance()) |
218 | 143 | .commit(); | 152 | .commit(); |
219 | 144 | mTitle = getString(R.string.stage_view); | 153 | mTitle = getString(R.string.stage_view); |
220 | 154 | toggerContainer(R.id.next_button, View.GONE); | ||
221 | 155 | toggerContainer(R.id.prev_button, View.GONE); | ||
222 | 145 | break; | 156 | break; |
223 | 146 | case NavigationOptions.LiveView: | 157 | case NavigationOptions.LiveView: |
224 | 147 | singleTab(); | 158 | singleTab(); |
225 | @@ -149,6 +160,8 @@ | |||
226 | 149 | .replace(R.id.container, LiveWebFragment.newInstance()) | 160 | .replace(R.id.container, LiveWebFragment.newInstance()) |
227 | 150 | .commit(); | 161 | .commit(); |
228 | 151 | mTitle = getString(R.string.live_view); | 162 | mTitle = getString(R.string.live_view); |
229 | 163 | toggerContainer(R.id.next_button, View.GONE); | ||
230 | 164 | toggerContainer(R.id.prev_button, View.GONE); | ||
231 | 152 | break; | 165 | break; |
232 | 153 | } | 166 | } |
233 | 154 | } | 167 | } |
234 | @@ -253,4 +266,14 @@ | |||
235 | 253 | fragment.refreshDisplay(); | 266 | fragment.refreshDisplay(); |
236 | 254 | } | 267 | } |
237 | 255 | } | 268 | } |
238 | 269 | |||
239 | 270 | public void next(View view) { | ||
240 | 271 | ServiceListFragment serviceListFragment = (ServiceListFragment) getFragmentManager().findFragmentByTag("servicelist"); | ||
241 | 272 | serviceListFragment.next(); | ||
242 | 273 | } | ||
243 | 274 | |||
244 | 275 | public void previous(View view) { | ||
245 | 276 | ServiceListFragment serviceListFragment = (ServiceListFragment) getFragmentManager().findFragmentByTag("servicelist"); | ||
246 | 277 | serviceListFragment.previous(); | ||
247 | 278 | } | ||
248 | 256 | } | 279 | } |
249 | 257 | 280 | ||
250 | === modified file 'app/src/main/java/org/openlp/android2/activities/SettingsActivity.java' | |||
251 | --- app/src/main/java/org/openlp/android2/activities/SettingsActivity.java 2015-01-23 17:53:00 +0000 | |||
252 | +++ app/src/main/java/org/openlp/android2/activities/SettingsActivity.java 2015-10-16 19:35:50 +0000 | |||
253 | @@ -167,8 +167,7 @@ | |||
254 | 167 | // Set the listener to watch for value changes. | 167 | // Set the listener to watch for value changes. |
255 | 168 | preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener); | 168 | preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener); |
256 | 169 | 169 | ||
259 | 170 | // Trigger the listener immediately with the preference's | 170 | // Trigger the listener immediately with the preference's current value. |
258 | 171 | // current value. | ||
260 | 172 | sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, | 171 | sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, |
261 | 173 | PreferenceManager | 172 | PreferenceManager |
262 | 174 | .getDefaultSharedPreferences(preference.getContext()) | 173 | .getDefaultSharedPreferences(preference.getContext()) |
263 | 175 | 174 | ||
264 | === modified file 'app/src/main/java/org/openlp/android2/common/OpenLPFragment.java' | |||
265 | --- app/src/main/java/org/openlp/android2/common/OpenLPFragment.java 2015-03-08 11:36:29 +0000 | |||
266 | +++ app/src/main/java/org/openlp/android2/common/OpenLPFragment.java 2015-10-16 19:35:50 +0000 | |||
267 | @@ -30,6 +30,7 @@ | |||
268 | 30 | import com.loopj.android.http.TextHttpResponseHandler; | 30 | import com.loopj.android.http.TextHttpResponseHandler; |
269 | 31 | import org.apache.http.Header; | 31 | import org.apache.http.Header; |
270 | 32 | import org.openlp.android2.R; | 32 | import org.openlp.android2.R; |
271 | 33 | import org.openlp.android2.api.Api; | ||
272 | 33 | 34 | ||
273 | 34 | abstract public class OpenLPFragment extends ListFragment{ | 35 | abstract public class OpenLPFragment extends ListFragment{ |
274 | 35 | 36 | ||
275 | @@ -83,4 +84,14 @@ | |||
276 | 83 | processUpdate(response, notInError); | 84 | processUpdate(response, notInError); |
277 | 84 | } | 85 | } |
278 | 85 | } | 86 | } |
279 | 87 | |||
280 | 88 | public void next() { | ||
281 | 89 | Log.d(LOG_TAG, "Going to next slide"); | ||
282 | 90 | triggerTextRequest(Api.LIVE_NEXT); | ||
283 | 91 | } | ||
284 | 92 | |||
285 | 93 | public void previous() { | ||
286 | 94 | Log.d(LOG_TAG, "Going to previous slide"); | ||
287 | 95 | triggerTextRequest(Api.LIVE_PREVIOUS); | ||
288 | 96 | } | ||
289 | 86 | } | 97 | } |
290 | 87 | 98 | ||
291 | === modified file 'app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java' | |||
292 | --- app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java 2015-01-23 17:53:00 +0000 | |||
293 | +++ app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java 2015-10-16 19:35:50 +0000 | |||
294 | @@ -62,9 +62,9 @@ | |||
295 | 62 | if (sharedPrefs.getBoolean(context.getString(R.string.key_enable_custom_timeout), false)) { | 62 | if (sharedPrefs.getBoolean(context.getString(R.string.key_enable_custom_timeout), false)) { |
296 | 63 | Log.d(LOG_TAG, "Overriding Connection and Socket timeouts"); | 63 | Log.d(LOG_TAG, "Overriding Connection and Socket timeouts"); |
297 | 64 | 64 | ||
301 | 65 | connectionTimeout = sharedPrefs.getInt(context.getString(R.string.key_connection_timeout), | 65 | connectionTimeout = Integer.parseInt(sharedPrefs.getString(context.getString(R.string.key_connection_timeout), |
302 | 66 | context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue) | 66 | String.valueOf(context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue)) |
303 | 67 | ); | 67 | )); |
304 | 68 | } | 68 | } |
305 | 69 | client.setTimeout(connectionTimeout); | 69 | client.setTimeout(connectionTimeout); |
306 | 70 | if (useSSL){ | 70 | if (useSSL){ |
307 | @@ -85,7 +85,7 @@ | |||
308 | 85 | public String getBaseUrl(){ | 85 | public String getBaseUrl(){ |
309 | 86 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | 86 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); |
310 | 87 | 87 | ||
312 | 88 | useSSL =sharedPrefs.getBoolean(context.getString(R.string.key_ssl_use), false); | 88 | useSSL = sharedPrefs.getBoolean(context.getString(R.string.key_ssl_use), false); |
313 | 89 | String host = sharedPrefs.getString(context.getString(R.string.key_host), | 89 | String host = sharedPrefs.getString(context.getString(R.string.key_host), |
314 | 90 | context.getString(R.string.host_default_value)); | 90 | context.getString(R.string.host_default_value)); |
315 | 91 | String port = sharedPrefs.getString(context.getString(R.string.key_port), "4316"); | 91 | String port = sharedPrefs.getString(context.getString(R.string.key_port), "4316"); |
316 | 92 | 92 | ||
317 | === modified file 'app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java' | |||
318 | --- app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java 2015-01-19 21:09:12 +0000 | |||
319 | +++ app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java 2015-10-16 19:35:50 +0000 | |||
320 | @@ -27,6 +27,8 @@ | |||
321 | 27 | import android.view.View; | 27 | import android.view.View; |
322 | 28 | import android.view.View.OnClickListener; | 28 | import android.view.View.OnClickListener; |
323 | 29 | import android.widget.Button; | 29 | import android.widget.Button; |
324 | 30 | import android.widget.RadioButton; | ||
325 | 31 | |||
326 | 30 | import org.json.JSONException; | 32 | import org.json.JSONException; |
327 | 31 | import org.json.JSONObject; | 33 | import org.json.JSONObject; |
328 | 32 | import org.openlp.android2.R; | 34 | import org.openlp.android2.R; |
329 | @@ -38,10 +40,10 @@ | |||
330 | 38 | public class BlankDisplayDialog extends OpenLPDialog { | 40 | public class BlankDisplayDialog extends OpenLPDialog { |
331 | 39 | private final String LOG_TAG = BlankDisplayDialog.class.getName(); | 41 | private final String LOG_TAG = BlankDisplayDialog.class.getName(); |
332 | 40 | public AlertDialog dialog; | 42 | public AlertDialog dialog; |
337 | 41 | Button desktop; | 43 | RadioButton desktop; |
338 | 42 | Button screen; | 44 | RadioButton screen; |
339 | 43 | Button theme; | 45 | RadioButton theme; |
340 | 44 | Button reset; | 46 | RadioButton reset; |
341 | 45 | 47 | ||
342 | 46 | /** | 48 | /** |
343 | 47 | * The system calls this only when creating the layout in a dialog. | 49 | * The system calls this only when creating the layout in a dialog. |
344 | @@ -65,28 +67,28 @@ | |||
345 | 65 | View view = inflater.inflate(R.layout.blank_display_dialog, null); | 67 | View view = inflater.inflate(R.layout.blank_display_dialog, null); |
346 | 66 | builder.setView(view); | 68 | builder.setView(view); |
347 | 67 | 69 | ||
349 | 68 | reset = (Button) view.findViewById(R.id.buttonReset); | 70 | reset = (RadioButton) view.findViewById(R.id.buttonReset); |
350 | 69 | reset.setOnClickListener(new OnClickListener() { | 71 | reset.setOnClickListener(new OnClickListener() { |
351 | 70 | @Override | 72 | @Override |
352 | 71 | public void onClick(View v) { | 73 | public void onClick(View v) { |
353 | 72 | triggerTextRequest(Api.DISPLAY_SHOW); | 74 | triggerTextRequest(Api.DISPLAY_SHOW); |
354 | 73 | } | 75 | } |
355 | 74 | }); | 76 | }); |
357 | 75 | screen = (Button) view.findViewById(R.id.buttonScreen); | 77 | screen = (RadioButton) view.findViewById(R.id.buttonScreen); |
358 | 76 | screen.setOnClickListener(new View.OnClickListener() { | 78 | screen.setOnClickListener(new View.OnClickListener() { |
359 | 77 | @Override | 79 | @Override |
360 | 78 | public void onClick(View v) { | 80 | public void onClick(View v) { |
361 | 79 | triggerTextRequest(Api.DISPLAY_BLANK); | 81 | triggerTextRequest(Api.DISPLAY_BLANK); |
362 | 80 | } | 82 | } |
363 | 81 | }); | 83 | }); |
365 | 82 | theme = (Button) view.findViewById(R.id.buttonTheme); | 84 | theme = (RadioButton) view.findViewById(R.id.buttonTheme); |
366 | 83 | theme.setOnClickListener(new View.OnClickListener() { | 85 | theme.setOnClickListener(new View.OnClickListener() { |
367 | 84 | @Override | 86 | @Override |
368 | 85 | public void onClick(View v) { | 87 | public void onClick(View v) { |
369 | 86 | triggerTextRequest(Api.DISPLAY_THEME); | 88 | triggerTextRequest(Api.DISPLAY_THEME); |
370 | 87 | } | 89 | } |
371 | 88 | }); | 90 | }); |
373 | 89 | desktop = (Button) view.findViewById(R.id.buttonDesktop); | 91 | desktop = (RadioButton) view.findViewById(R.id.buttonDesktop); |
374 | 90 | desktop.setOnClickListener(new View.OnClickListener() { | 92 | desktop.setOnClickListener(new View.OnClickListener() { |
375 | 91 | @Override | 93 | @Override |
376 | 92 | public void onClick(View v) { | 94 | public void onClick(View v) { |
377 | @@ -122,21 +124,22 @@ | |||
378 | 122 | } | 124 | } |
379 | 123 | 125 | ||
380 | 124 | public void populateDisplay(String json) { | 126 | public void populateDisplay(String json) { |
382 | 125 | Log.d(LOG_TAG, "populateDisplay"); | 127 | Log.d(LOG_TAG, "populateDisplay : " + json ); |
383 | 128 | reset_display(); | ||
384 | 126 | try { | 129 | try { |
385 | 127 | JSONObject item = new JSONObject(json).getJSONObject("results"); | 130 | JSONObject item = new JSONObject(json).getJSONObject("results"); |
393 | 128 | if (item.getString("theme").equals("false") & | 131 | if (item.getString("theme").equals("true")){ |
394 | 129 | item.getString("display").equals("false") & | 132 | theme.setChecked(true); |
388 | 130 | item.getString("blank").equals("false")) { | ||
389 | 131 | screen.setEnabled(true); | ||
390 | 132 | theme.setEnabled(true); | ||
391 | 133 | desktop.setEnabled(true); | ||
392 | 134 | reset.setEnabled(false); | ||
395 | 135 | } else { | 133 | } else { |
400 | 136 | screen.setEnabled(false); | 134 | if (item.getString("blank").equals("true")){ |
401 | 137 | theme.setEnabled(false); | 135 | screen.setChecked(true); |
402 | 138 | desktop.setEnabled(false); | 136 | } else{ |
403 | 139 | reset.setEnabled(true); | 137 | if (item.getString("display").equals("true")){ |
404 | 138 | desktop.setChecked(true); | ||
405 | 139 | } else{ | ||
406 | 140 | reset.setChecked(true); | ||
407 | 141 | } | ||
408 | 142 | } | ||
409 | 140 | } | 143 | } |
410 | 141 | } catch (JSONException e) { | 144 | } catch (JSONException e) { |
411 | 142 | Log.e(LOG_TAG, "Exception with Json = " + json); | 145 | Log.e(LOG_TAG, "Exception with Json = " + json); |
412 | @@ -146,9 +149,13 @@ | |||
413 | 146 | 149 | ||
414 | 147 | public void errorDisplay(int statusCode, String responseString) { | 150 | public void errorDisplay(int statusCode, String responseString) { |
415 | 148 | Log.d(LOG_TAG, String.format("URL Error status code %d text %s", statusCode, responseString)); | 151 | Log.d(LOG_TAG, String.format("URL Error status code %d text %s", statusCode, responseString)); |
420 | 149 | screen.setEnabled(false); | 152 | reset_display(); |
421 | 150 | theme.setEnabled(false); | 153 | } |
422 | 151 | desktop.setEnabled(false); | 154 | |
423 | 152 | reset.setEnabled(false); | 155 | private void reset_display(){ |
424 | 156 | screen.setChecked(false); | ||
425 | 157 | theme.setChecked(false); | ||
426 | 158 | desktop.setChecked(false); | ||
427 | 159 | reset.setChecked(false); | ||
428 | 153 | } | 160 | } |
429 | 154 | } | 161 | } |
430 | 155 | 162 | ||
431 | === modified file 'app/src/main/java/org/openlp/android2/fragments/AboutFragment.java' | |||
432 | --- app/src/main/java/org/openlp/android2/fragments/AboutFragment.java 2015-01-23 17:53:00 +0000 | |||
433 | +++ app/src/main/java/org/openlp/android2/fragments/AboutFragment.java 2015-10-16 19:35:50 +0000 | |||
434 | @@ -55,7 +55,7 @@ | |||
435 | 55 | html.append(" © 2004-").append(date).append(" Raoul Snyman\n"); | 55 | html.append(" © 2004-").append(date).append(" Raoul Snyman\n"); |
436 | 56 | html.append(getString(R.string.about_display_5)); | 56 | html.append(getString(R.string.about_display_5)); |
437 | 57 | html.append(" © 2004-").append(date); | 57 | html.append(" © 2004-").append(date); |
439 | 58 | html.append("\nTim Bentley, Johan Mynhardt"); | 58 | html.append("\nTim Bentley, Tomas Groth, Johan Mynhardt"); |
440 | 59 | html.append("\n\n\n"); | 59 | html.append("\n\n\n"); |
441 | 60 | html.append(getString(R.string.about_display_6)); | 60 | html.append(getString(R.string.about_display_6)); |
442 | 61 | html.append("\n"); | 61 | html.append("\n"); |
443 | 62 | 62 | ||
444 | === modified file 'app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java' | |||
445 | --- app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java 2015-04-11 11:12:51 +0000 | |||
446 | +++ app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java 2015-10-16 19:35:50 +0000 | |||
447 | @@ -23,6 +23,7 @@ | |||
448 | 23 | import android.graphics.Typeface; | 23 | import android.graphics.Typeface; |
449 | 24 | import android.os.Bundle; | 24 | import android.os.Bundle; |
450 | 25 | import android.content.SharedPreferences; | 25 | import android.content.SharedPreferences; |
451 | 26 | import android.preference.PreferenceManager; | ||
452 | 26 | import android.text.Html; | 27 | import android.text.Html; |
453 | 27 | import android.util.Log; | 28 | import android.util.Log; |
454 | 28 | import android.util.TypedValue; | 29 | import android.util.TypedValue; |
455 | @@ -139,7 +140,14 @@ | |||
456 | 139 | } | 140 | } |
457 | 140 | }; | 141 | }; |
458 | 141 | setListAdapter(adapter); | 142 | setListAdapter(adapter); |
460 | 142 | getListView().setSelection(selected - 1); | 143 | |
461 | 144 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
462 | 145 | Boolean autoscroll = | ||
463 | 146 | sharedPrefs.getBoolean(context.getString(R.string.key_auto_scroll), false); | ||
464 | 147 | |||
465 | 148 | if (autoscroll){ | ||
466 | 149 | getListView().setSelection(selected - 1); | ||
467 | 150 | } | ||
468 | 143 | Log.i(LOG_TAG, "populate_display - exit"); | 151 | Log.i(LOG_TAG, "populate_display - exit"); |
469 | 144 | } | 152 | } |
470 | 145 | 153 | ||
471 | 146 | 154 | ||
472 | === modified file 'app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java' | |||
473 | --- app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java 2015-05-27 20:05:55 +0000 | |||
474 | +++ app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java 2015-10-16 19:35:50 +0000 | |||
475 | @@ -24,6 +24,7 @@ | |||
476 | 24 | import android.graphics.Color; | 24 | import android.graphics.Color; |
477 | 25 | import android.graphics.Typeface; | 25 | import android.graphics.Typeface; |
478 | 26 | import android.os.Bundle; | 26 | import android.os.Bundle; |
479 | 27 | import android.preference.PreferenceManager; | ||
480 | 27 | import android.util.Log; | 28 | import android.util.Log; |
481 | 28 | import android.util.TypedValue; | 29 | import android.util.TypedValue; |
482 | 29 | import android.view.LayoutInflater; | 30 | import android.view.LayoutInflater; |
483 | @@ -44,6 +45,7 @@ | |||
484 | 44 | import java.util.ArrayList; | 45 | import java.util.ArrayList; |
485 | 45 | import java.util.HashMap; | 46 | import java.util.HashMap; |
486 | 46 | import java.util.List; | 47 | import java.util.List; |
487 | 48 | import java.util.Map; | ||
488 | 47 | 49 | ||
489 | 48 | 50 | ||
490 | 49 | public class ServiceListFragment extends OpenLPFragment { | 51 | public class ServiceListFragment extends OpenLPFragment { |
491 | @@ -167,10 +169,17 @@ | |||
492 | 167 | text1.setTypeface(null, Typeface.NORMAL); | 169 | text1.setTypeface(null, Typeface.NORMAL); |
493 | 168 | } | 170 | } |
494 | 169 | return view; | 171 | return view; |
495 | 170 | |||
496 | 171 | } | 172 | } |
497 | 172 | }; | 173 | }; |
498 | 173 | setListAdapter(adapter); | 174 | setListAdapter(adapter); |
499 | 175 | |||
500 | 176 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
501 | 177 | Boolean autoscroll = | ||
502 | 178 | sharedPrefs.getBoolean(context.getString(R.string.key_auto_scroll), false); | ||
503 | 179 | |||
504 | 180 | if (autoscroll){ | ||
505 | 181 | getListView().setSelection(selected - 1); | ||
506 | 182 | } | ||
507 | 174 | Log.i(LOG_TAG, "populate_display - exit"); | 183 | Log.i(LOG_TAG, "populate_display - exit"); |
508 | 175 | } | 184 | } |
509 | 176 | 185 | ||
510 | 177 | 186 | ||
511 | === added file 'app/src/main/res/drawable-hdpi/ic_arrow_back_white.png' | |||
512 | 178 | Binary files app/src/main/res/drawable-hdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ | 187 | Binary files app/src/main/res/drawable-hdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ |
513 | === added file 'app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png' | |||
514 | 179 | Binary files app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ | 188 | Binary files app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ |
515 | === added file 'app/src/main/res/drawable-hdpi/ic_drawer.png' | |||
516 | 180 | Binary files app/src/main/res/drawable-hdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ | 189 | Binary files app/src/main/res/drawable-hdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ |
517 | === modified file 'app/src/main/res/drawable-hdpi/ic_menu_white.png' | |||
518 | 181 | Binary files app/src/main/res/drawable-hdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-hdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ | 190 | Binary files app/src/main/res/drawable-hdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-hdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ |
519 | === added file 'app/src/main/res/drawable-mdpi/ic_arrow_back_white.png' | |||
520 | 182 | Binary files app/src/main/res/drawable-mdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ | 191 | Binary files app/src/main/res/drawable-mdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ |
521 | === added file 'app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png' | |||
522 | 183 | Binary files app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ | 192 | Binary files app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ |
523 | === added file 'app/src/main/res/drawable-mdpi/ic_drawer.png' | |||
524 | 184 | Binary files app/src/main/res/drawable-mdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ | 193 | Binary files app/src/main/res/drawable-mdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ |
525 | === modified file 'app/src/main/res/drawable-mdpi/ic_menu_white.png' | |||
526 | 185 | Binary files app/src/main/res/drawable-mdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-mdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ | 194 | Binary files app/src/main/res/drawable-mdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-mdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ |
527 | === added file 'app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png' | |||
528 | 186 | Binary files app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ | 195 | Binary files app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ |
529 | === added file 'app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png' | |||
530 | 187 | Binary files app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ | 196 | Binary files app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ |
531 | === added file 'app/src/main/res/drawable-xhdpi/ic_drawer.png' | |||
532 | 188 | Binary files app/src/main/res/drawable-xhdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ | 197 | Binary files app/src/main/res/drawable-xhdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ |
533 | === modified file 'app/src/main/res/drawable-xhdpi/ic_menu_white.png' | |||
534 | 189 | Binary files app/src/main/res/drawable-xhdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-xhdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ | 198 | Binary files app/src/main/res/drawable-xhdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-xhdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ |
535 | === added file 'app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png' | |||
536 | 190 | Binary files app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ | 199 | Binary files app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png 2015-10-16 19:35:50 +0000 differ |
537 | === added file 'app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png' | |||
538 | 191 | Binary files app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ | 200 | Binary files app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png 2015-10-16 19:35:50 +0000 differ |
539 | === added file 'app/src/main/res/drawable-xxhdpi/ic_drawer.png' | |||
540 | 192 | Binary files app/src/main/res/drawable-xxhdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ | 201 | Binary files app/src/main/res/drawable-xxhdpi/ic_drawer.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_drawer.png 2015-10-16 19:35:50 +0000 differ |
541 | === modified file 'app/src/main/res/drawable-xxhdpi/ic_menu_white.png' | |||
542 | 193 | Binary files app/src/main/res/drawable-xxhdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-xxhdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ | 202 | Binary files app/src/main/res/drawable-xxhdpi/ic_menu_white.png 2015-05-27 20:05:55 +0000 and app/src/main/res/drawable-xxhdpi/ic_menu_white.png 2015-10-16 19:35:50 +0000 differ |
543 | === modified file 'app/src/main/res/drawable/customborder.xml' | |||
544 | --- app/src/main/res/drawable/customborder.xml 2015-04-19 20:12:18 +0000 | |||
545 | +++ app/src/main/res/drawable/customborder.xml 2015-10-16 19:35:50 +0000 | |||
546 | @@ -1,10 +1,11 @@ | |||
547 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
548 | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
549 | 3 | android:shape="rectangle"> | 3 | android:shape="rectangle"> |
551 | 4 | <corners android:radius="20dp"/> | 4 | |
552 | 5 | <padding android:left="10dp" | 5 | <padding android:left="10dp" |
553 | 6 | android:right="10dp" | 6 | android:right="10dp" |
554 | 7 | android:top="10dp" | 7 | android:top="10dp" |
555 | 8 | android:bottom="10dp"/> | 8 | android:bottom="10dp"/> |
557 | 9 | <solid android:color="#CCCCCC"/> | 9 | <solid android:color="#c4c4c4"/> |
558 | 10 | <stroke android:width="2px" android:color="#ffffff"/> | ||
559 | 10 | </shape> | 11 | </shape> |
560 | 11 | \ No newline at end of file | 12 | \ No newline at end of file |
561 | 12 | 13 | ||
562 | === modified file 'app/src/main/res/layout/activity_main.xml' | |||
563 | --- app/src/main/res/layout/activity_main.xml 2015-04-11 11:12:51 +0000 | |||
564 | +++ app/src/main/res/layout/activity_main.xml 2015-10-16 19:35:50 +0000 | |||
565 | @@ -8,31 +8,59 @@ | |||
566 | 8 | 8 | ||
567 | 9 | <!-- As the main content view, the view below consumes the entire | 9 | <!-- As the main content view, the view below consumes the entire |
568 | 10 | space available using match_parent in both dimensions. --> | 10 | space available using match_parent in both dimensions. --> |
594 | 11 | <FrameLayout | 11 | <android.support.design.widget.CoordinatorLayout |
595 | 12 | android:id="@+id/container" | 12 | android:layout_width="fill_parent" |
596 | 13 | android:layout_width="match_parent" | 13 | android:layout_height="wrap_content" |
597 | 14 | android:layout_height="match_parent" /> | 14 | android:orientation="vertical"> |
598 | 15 | <LinearLayout | 15 | <FrameLayout |
599 | 16 | android:orientation="horizontal" | 16 | android:id="@+id/container" |
600 | 17 | android:layout_width="match_parent" | 17 | android:layout_width="match_parent" |
601 | 18 | android:layout_height="match_parent"> | 18 | android:layout_height="match_parent" /> |
602 | 19 | <FrameLayout | 19 | <LinearLayout |
603 | 20 | android:id="@+id/container_left" | 20 | android:layout_width="match_parent" |
604 | 21 | android:layout_weight="1" | 21 | android:layout_height="match_parent" |
605 | 22 | android:layout_gravity="start" | 22 | android:orientation="horizontal"> |
606 | 23 | android:layout_width="0dp" | 23 | <FrameLayout |
607 | 24 | android:layout_height="wrap_content" | 24 | android:id="@+id/container_left" |
608 | 25 | android:layout_marginRight="5dp" /> | 25 | android:layout_width="0dp" |
609 | 26 | 26 | android:layout_height="wrap_content" | |
610 | 27 | <FrameLayout | 27 | android:layout_gravity="start" |
611 | 28 | android:id="@+id/container_right" | 28 | android:layout_marginRight="5dp" |
612 | 29 | android:layout_weight="1" | 29 | android:layout_weight="1" /> |
613 | 30 | android:layout_gravity="end" | 30 | |
614 | 31 | android:layout_width="0dp" | 31 | <FrameLayout |
615 | 32 | android:layout_height="wrap_content" | 32 | android:id="@+id/container_right" |
616 | 33 | android:layout_marginLeft="5dp" /> | 33 | android:layout_width="0dp" |
617 | 34 | </LinearLayout> | 34 | android:layout_height="wrap_content" |
618 | 35 | 35 | android:layout_gravity="end" | |
619 | 36 | android:layout_marginLeft="5dp" | ||
620 | 37 | android:layout_weight="1" /> | ||
621 | 38 | |||
622 | 39 | </LinearLayout> | ||
623 | 40 | |||
624 | 41 | <android.support.design.widget.FloatingActionButton | ||
625 | 42 | android:id="@+id/next_button" | ||
626 | 43 | android:layout_width="wrap_content" | ||
627 | 44 | android:layout_height="wrap_content" | ||
628 | 45 | android:layout_gravity="bottom|end" | ||
629 | 46 | android:layout_margin="16dp" | ||
630 | 47 | android:onClick="next" | ||
631 | 48 | android:src="@drawable/ic_arrow_forward_white" | ||
632 | 49 | android:text="@string/next" | ||
633 | 50 | android:visibility="gone" /> | ||
634 | 51 | |||
635 | 52 | <android.support.design.widget.FloatingActionButton | ||
636 | 53 | android:id="@+id/prev_button" | ||
637 | 54 | android:layout_width="wrap_content" | ||
638 | 55 | android:layout_height="wrap_content" | ||
639 | 56 | android:layout_gravity="bottom|start" | ||
640 | 57 | android:layout_margin="16dp" | ||
641 | 58 | android:onClick="previous" | ||
642 | 59 | android:src="@drawable/ic_arrow_back_white" | ||
643 | 60 | android:text="@string/previous" | ||
644 | 61 | android:visibility="gone" /> | ||
645 | 62 | |||
646 | 63 | </android.support.design.widget.CoordinatorLayout> | ||
647 | 36 | <!-- android:layout_gravity="start" tells DrawerLayout to treat | 64 | <!-- android:layout_gravity="start" tells DrawerLayout to treat |
648 | 37 | this as a sliding drawer on the left side for left-to-right | 65 | this as a sliding drawer on the left side for left-to-right |
649 | 38 | languages and on the right side for right-to-left languages. | 66 | languages and on the right side for right-to-left languages. |
650 | 39 | 67 | ||
651 | === modified file 'app/src/main/res/layout/blank_display_dialog.xml' | |||
652 | --- app/src/main/res/layout/blank_display_dialog.xml 2015-01-23 17:53:00 +0000 | |||
653 | +++ app/src/main/res/layout/blank_display_dialog.xml 2015-10-16 19:35:50 +0000 | |||
654 | @@ -6,7 +6,6 @@ | |||
655 | 6 | android:layout_width="fill_parent" | 6 | android:layout_width="fill_parent" |
656 | 7 | android:layout_height="fill_parent" | 7 | android:layout_height="fill_parent" |
657 | 8 | android:weightSum="1"> | 8 | android:weightSum="1"> |
658 | 9 | |||
659 | 10 | <TextView | 9 | <TextView |
660 | 11 | android:layout_width="294dp" | 10 | android:layout_width="294dp" |
661 | 12 | android:layout_height="wrap_content" | 11 | android:layout_height="wrap_content" |
662 | @@ -16,7 +15,7 @@ | |||
663 | 16 | android:textStyle="bold|italic" | 15 | android:textStyle="bold|italic" |
664 | 17 | android:textSize="40px" | 16 | android:textSize="40px" |
665 | 18 | android:height="45px"/> | 17 | android:height="45px"/> |
667 | 19 | <Button | 18 | <RadioButton |
668 | 20 | android:layout_width="match_parent" | 19 | android:layout_width="match_parent" |
669 | 21 | android:layout_height="wrap_content" | 20 | android:layout_height="wrap_content" |
670 | 22 | android:text="@string/display_reset" | 21 | android:text="@string/display_reset" |
671 | @@ -24,7 +23,7 @@ | |||
672 | 24 | android:textSize="20sp" | 23 | android:textSize="20sp" |
673 | 25 | android:height="40dp" | 24 | android:height="40dp" |
674 | 26 | android:clickable="true"/> | 25 | android:clickable="true"/> |
676 | 27 | <Button | 26 | <RadioButton |
677 | 28 | android:layout_width="match_parent" | 27 | android:layout_width="match_parent" |
678 | 29 | android:layout_height="wrap_content" | 28 | android:layout_height="wrap_content" |
679 | 30 | android:text="@string/display_screen" | 29 | android:text="@string/display_screen" |
680 | @@ -32,7 +31,7 @@ | |||
681 | 32 | android:textSize="20sp" | 31 | android:textSize="20sp" |
682 | 33 | android:height="40dp" | 32 | android:height="40dp" |
683 | 34 | android:clickable="true"/> | 33 | android:clickable="true"/> |
685 | 35 | <Button | 34 | <RadioButton |
686 | 36 | android:layout_width="match_parent" | 35 | android:layout_width="match_parent" |
687 | 37 | android:layout_height="wrap_content" | 36 | android:layout_height="wrap_content" |
688 | 38 | android:text="@string/display_theme" | 37 | android:text="@string/display_theme" |
689 | @@ -40,7 +39,7 @@ | |||
690 | 40 | android:textSize="20sp" | 39 | android:textSize="20sp" |
691 | 41 | android:height="40dp" | 40 | android:height="40dp" |
692 | 42 | android:clickable="true"/> | 41 | android:clickable="true"/> |
694 | 43 | <Button | 42 | <RadioButton |
695 | 44 | android:layout_width="match_parent" | 43 | android:layout_width="match_parent" |
696 | 45 | android:layout_height="wrap_content" | 44 | android:layout_height="wrap_content" |
697 | 46 | android:text="@string/display_desktop" | 45 | android:text="@string/display_desktop" |
698 | @@ -48,5 +47,4 @@ | |||
699 | 48 | android:textSize="20sp" | 47 | android:textSize="20sp" |
700 | 49 | android:height="40dp" | 48 | android:height="40dp" |
701 | 50 | android:clickable="true"/> | 49 | android:clickable="true"/> |
702 | 51 | |||
703 | 52 | </LinearLayout> | 50 | </LinearLayout> |
704 | 53 | \ No newline at end of file | 51 | \ No newline at end of file |
705 | 54 | 52 | ||
706 | === modified file 'app/src/main/res/layout/fragment_livelist_list.xml' | |||
707 | --- app/src/main/res/layout/fragment_livelist_list.xml 2015-04-19 20:12:18 +0000 | |||
708 | +++ app/src/main/res/layout/fragment_livelist_list.xml 2015-10-16 19:35:50 +0000 | |||
709 | @@ -13,7 +13,7 @@ | |||
710 | 13 | 13 | ||
711 | 14 | <TextView | 14 | <TextView |
712 | 15 | android:id="@+id/tag" | 15 | android:id="@+id/tag" |
714 | 16 | android:layout_width="0dp" | 16 | android:layout_width="75sp" |
715 | 17 | android:layout_height="wrap_content" | 17 | android:layout_height="wrap_content" |
716 | 18 | android:textSize="14sp" | 18 | android:textSize="14sp" |
717 | 19 | android:paddingTop="10dp" | 19 | android:paddingTop="10dp" |
718 | @@ -23,7 +23,7 @@ | |||
719 | 23 | android:layout_weight="1"/> | 23 | android:layout_weight="1"/> |
720 | 24 | <TextView | 24 | <TextView |
721 | 25 | android:id="@+id/liveListNormal" | 25 | android:id="@+id/liveListNormal" |
723 | 26 | android:layout_width="0dp" | 26 | android:layout_width="fill_parent" |
724 | 27 | android:layout_height="wrap_content" | 27 | android:layout_height="wrap_content" |
725 | 28 | android:textColor="#ff2a2a2a" | 28 | android:textColor="#ff2a2a2a" |
726 | 29 | android:textSize="14sp" | 29 | android:textSize="14sp" |
727 | @@ -40,5 +40,6 @@ | |||
728 | 40 | android:paddingTop="10dp" | 40 | android:paddingTop="10dp" |
729 | 41 | android:paddingBottom="10dp" | 41 | android:paddingBottom="10dp" |
730 | 42 | android:textStyle="bold|italic" | 42 | android:textStyle="bold|italic" |
732 | 43 | android:layout_weight="1"/> | 43 | android:layout_weight="1" |
733 | 44 | android:visibility="gone"/> | ||
734 | 44 | </LinearLayout> | 45 | </LinearLayout> |
735 | 45 | 46 | ||
736 | === modified file 'app/src/main/res/values-cs/strings.xml' | |||
737 | --- app/src/main/res/values-cs/strings.xml 2015-05-30 05:53:10 +0000 | |||
738 | +++ app/src/main/res/values-cs/strings.xml 2015-10-16 19:35:50 +0000 | |||
739 | @@ -26,25 +26,29 @@ | |||
740 | 26 | <string name="connection_timeout_summary">Vybrat hodnotu (milisekundy)</string> | 26 | <string name="connection_timeout_summary">Vybrat hodnotu (milisekundy)</string> |
741 | 27 | <string name="connection_userid">Uživatelské jméno</string> | 27 | <string name="connection_userid">Uživatelské jméno</string> |
742 | 28 | <string name="custom_timeout">Nastavit uživatelský časový limit</string> | 28 | <string name="custom_timeout">Nastavit uživatelský časový limit</string> |
748 | 29 | <string name="display_blank_summary">Vybrat požadovaný prázdný typ</string> | 29 | <string name="display_blank_summary">Vybrat požadované zobrazení</string> |
749 | 30 | <string name="display_desktop">Prázdné zobrazení na plochu</string> | 30 | <string name="display_desktop">Zobrazit pozadí plochy</string> |
750 | 31 | <string name="display_reset">Obnovit zobrazení</string> | 31 | <string name="display_list_autoscroll">Povolit vybrané položce rolovat na střed seznamu</string> |
751 | 32 | <string name="display_screen">Prázdné zobrazení na prázdné</string> | 32 | <string name="display_reset">Zobrazit naživo</string> |
752 | 33 | <string name="display_theme">Prázdné zobrazení na motiv</string> | 33 | <string name="display_settings">Nastavení zobrazení</string> |
753 | 34 | <string name="display_screen">Zobrazit jen černou</string> | ||
754 | 35 | <string name="display_theme">Zobrazit jen motiv</string> | ||
755 | 34 | <string name="enable_custom_timeouts">Zapnout uživatelský časový limit</string> | 36 | <string name="enable_custom_timeouts">Zapnout uživatelský časový limit</string> |
756 | 35 | <string name="enter_alert_text">Vložit text upozornění</string> | 37 | <string name="enter_alert_text">Vložit text upozornění</string> |
757 | 38 | <string name="enable_autoscroll">Povolit automatické centrování obrazovky</string> | ||
758 | 36 | <string name="home">Domů</string> | 39 | <string name="home">Domů</string> |
759 | 37 | <string name="httpreturn_unauthorised">Neoprávněný přístup, zadejte prosím správné uživatelské jméno a heslo</string> | 40 | <string name="httpreturn_unauthorised">Neoprávněný přístup, zadejte prosím správné uživatelské jméno a heslo</string> |
760 | 38 | <string name="live_list">Seznam naživo</string> | 41 | <string name="live_list">Seznam naživo</string> |
761 | 39 | <string name="live_view">Zobrazení naživo</string> | 42 | <string name="live_view">Zobrazení naživo</string> |
762 | 40 | <string name="navigation_drawer_open">Otevřít navigační panel</string> | 43 | <string name="navigation_drawer_open">Otevřít navigační panel</string> |
763 | 41 | <string name="navigation_drawer_close">Zavřít navigační panel</string> | 44 | <string name="navigation_drawer_close">Zavřít navigační panel</string> |
764 | 45 | <string name="next">Další</string> | ||
765 | 42 | <string name="none">Žádný</string> | 46 | <string name="none">Žádný</string> |
766 | 43 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
767 | 48 | <string name="previous">Předchozí</string> | ||
768 | 44 | <string name="process">Zpracovat</string> | 49 | <string name="process">Zpracovat</string> |
769 | 45 | <string name="service_list">Seznam služby</string> | 50 | <string name="service_list">Seznam služby</string> |
770 | 46 | <string name="stage_view">Zobrazení na pódiu</string> | 51 | <string name="stage_view">Zobrazení na pódiu</string> |
771 | 47 | <string name="text_size_type">Velikost zobrazeného textu</string> | ||
772 | 48 | <string name="text_size">Vybrat velikost zobrazeného textu</string> | 52 | <string name="text_size">Vybrat velikost zobrazeného textu</string> |
773 | 49 | <string name="text_size_summary">Změnit velikost textu služby</string> | 53 | <string name="text_size_summary">Změnit velikost textu služby</string> |
774 | 50 | <string name="title_activity_settings">Nastavení</string> | 54 | <string name="title_activity_settings">Nastavení</string> |
775 | 51 | 55 | ||
776 | === modified file 'app/src/main/res/values-da/strings.xml' | |||
777 | --- app/src/main/res/values-da/strings.xml 2015-05-30 05:53:10 +0000 | |||
778 | +++ app/src/main/res/values-da/strings.xml 2015-10-16 19:35:50 +0000 | |||
779 | @@ -11,6 +11,7 @@ | |||
780 | 11 | <string name="action_about">Om</string> | 11 | <string name="action_about">Om</string> |
781 | 12 | <string name="action_alert">Meddelelse</string> | 12 | <string name="action_alert">Meddelelse</string> |
782 | 13 | <string name="action_back">Tilbage</string> | 13 | <string name="action_back">Tilbage</string> |
783 | 14 | <string name="action_blank">Skift skærm</string> | ||
784 | 14 | <string name="action_preferences">Indstillinger</string> | 15 | <string name="action_preferences">Indstillinger</string> |
785 | 15 | <string name="action_refresh">Opdatér</string> | 16 | <string name="action_refresh">Opdatér</string> |
786 | 16 | <string name="action_search">Søg</string> | 17 | <string name="action_search">Søg</string> |
787 | @@ -24,16 +25,29 @@ | |||
788 | 24 | <string name="connection_timeout">Timeout for forbindelse</string> | 25 | <string name="connection_timeout">Timeout for forbindelse</string> |
789 | 25 | <string name="connection_timeout_summary">Vælg en værdi (millisekunder)</string> | 26 | <string name="connection_timeout_summary">Vælg en værdi (millisekunder)</string> |
790 | 26 | <string name="connection_userid">Brugernavn</string> | 27 | <string name="connection_userid">Brugernavn</string> |
792 | 27 | <string name="display_blank_summary">Vælg den ønskede \"sort skærm\" type</string> | 28 | <string name="custom_timeout">Sæt brugerdefineret timeout</string> |
793 | 29 | <string name="display_blank_summary">Vælg den ønskede skærm</string> | ||
794 | 30 | <string name="display_desktop">Vis skrivebordsbaggrund</string> | ||
795 | 31 | <string name="display_reset">Vis fremvisningsskærm</string> | ||
796 | 32 | <string name="display_screen">Vis kun sort</string> | ||
797 | 33 | <string name="display_theme">Vis kun temabaggrund</string> | ||
798 | 28 | <string name="enable_custom_timeouts">Aktiver brugerdefinerede timeouts</string> | 34 | <string name="enable_custom_timeouts">Aktiver brugerdefinerede timeouts</string> |
799 | 29 | <string name="enter_alert_text">Indtast meddelelsestekst</string> | 35 | <string name="enter_alert_text">Indtast meddelelsestekst</string> |
800 | 30 | <string name="home">Hjem</string> | 36 | <string name="home">Hjem</string> |
801 | 37 | <string name="httpreturn_unauthorised">Adgang ikke godkendt. Indtast gyldigt brugernavn og adgangskode</string> | ||
802 | 38 | <string name="live_list">Fremvisningsliste</string> | ||
803 | 31 | <string name="navigation_drawer_open">Åbn navigationsskuffe</string> | 39 | <string name="navigation_drawer_open">Åbn navigationsskuffe</string> |
804 | 32 | <string name="navigation_drawer_close">Luk navigationsskuffe</string> | 40 | <string name="navigation_drawer_close">Luk navigationsskuffe</string> |
805 | 41 | <string name="next">Næste</string> | ||
806 | 33 | <string name="none">Ingen</string> | 42 | <string name="none">Ingen</string> |
807 | 34 | <string name="port">Port</string> | 43 | <string name="port">Port</string> |
808 | 44 | <string name="previous">Forrige</string> | ||
809 | 45 | <string name="process">Proces</string> | ||
810 | 35 | <string name="service_list">Programoversigt</string> | 46 | <string name="service_list">Programoversigt</string> |
811 | 47 | <string name="stage_view">Scenevisning</string> | ||
812 | 48 | <string name="text_size">Vælg tekststørrelse til visning</string> | ||
813 | 36 | <string name="text_size_summary">Ændr programmets tekststørrelse</string> | 49 | <string name="text_size_summary">Ændr programmets tekststørrelse</string> |
814 | 37 | <string name="title_activity_settings">Indstillinger</string> | 50 | <string name="title_activity_settings">Indstillinger</string> |
815 | 38 | <string name="url_hint">Værtsnavn eller IP</string> | 51 | <string name="url_hint">Værtsnavn eller IP</string> |
816 | 52 | <string name="unable">Kunne ikke udføre forespørsel - tjek netværksindstillingerne</string> | ||
817 | 39 | </resources> | 53 | </resources> |
818 | 40 | 54 | ||
819 | === modified file 'app/src/main/res/values-de/strings.xml' | |||
820 | --- app/src/main/res/values-de/strings.xml 2015-05-30 05:53:10 +0000 | |||
821 | +++ app/src/main/res/values-de/strings.xml 2015-10-16 19:35:50 +0000 | |||
822 | @@ -1,25 +1,55 @@ | |||
823 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
824 | 2 | <resources> | 2 | <resources> |
825 | 3 | <string name="about_display_1">OpenLP ist eine freie Präsentationssoftware für Kirchen und Gemeinden. Erfahre mehr über OpenLP.</string> | ||
826 | 4 | <string name="about_display_2">Weitere Informationen sind auf der OpenLP Webseite zu finden.</string> | ||
827 | 3 | <string name="about_display_4">Copyright</string> | 5 | <string name="about_display_4">Copyright</string> |
828 | 4 | <string name="about_display_5">Anteiliges Urheberrecht</string> | 6 | <string name="about_display_5">Anteiliges Urheberrecht</string> |
829 | 5 | <string name="about_display_6">Lizenz</string> | 7 | <string name="about_display_6">Lizenz</string> |
830 | 8 | <string name="about_display_7">Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License Version 2, herausgegeben von der Free Software Foundation, weitergeben und/oder modifizieren.</string> | ||
831 | 9 | <string name="about_display_8">Dieses Programms wird in der Hoffnung zur Verfügung gestellt, dass es Ihnen von Nutzen sein wird, aber OHNE JEDE GEWÄHRLEISTUNG; auch ohne einer implizite Gewährleistung von MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK</string> | ||
832 | 6 | <string name="action_settings">Einstellungen</string> | 10 | <string name="action_settings">Einstellungen</string> |
833 | 7 | <string name="action_about">Über</string> | 11 | <string name="action_about">Über</string> |
834 | 8 | <string name="action_alert">Hinweis</string> | 12 | <string name="action_alert">Hinweis</string> |
835 | 9 | <string name="action_back">Zurück</string> | 13 | <string name="action_back">Zurück</string> |
836 | 14 | <string name="action_blank">Anzeige umschalten</string> | ||
837 | 10 | <string name="action_preferences">Voreinstellungen</string> | 15 | <string name="action_preferences">Voreinstellungen</string> |
838 | 11 | <string name="action_refresh">Aktualisieren</string> | 16 | <string name="action_refresh">Aktualisieren</string> |
839 | 12 | <string name="action_search">Suche</string> | 17 | <string name="action_search">Suche</string> |
840 | 13 | <string name="app_name">OpenLP</string> | 18 | <string name="app_name">OpenLP</string> |
841 | 14 | <string name="cancel">Abbruch</string> | 19 | <string name="cancel">Abbruch</string> |
842 | 20 | <string name="connection_configuration">Netzwerk einrichten</string> | ||
843 | 21 | <string name="connection_password">Passwort</string> | ||
844 | 22 | <string name="connection_profile">Server-Einstellungen</string> | ||
845 | 23 | <string name="connection_profile_ssl_use">HTTPS benutzen</string> | ||
846 | 24 | <string name="connection_profile_ssl_summary">Festlegen, ob HTTPS verwendet werden soll</string> | ||
847 | 15 | <string name="connection_timeout">Verbindungzeit überschritten</string> | 25 | <string name="connection_timeout">Verbindungzeit überschritten</string> |
848 | 16 | <string name="connection_timeout_summary">Wähle einen Wert (in Millisekunden)</string> | 26 | <string name="connection_timeout_summary">Wähle einen Wert (in Millisekunden)</string> |
850 | 17 | <string name="display_blank_summary">Wähle den erforderlichen Verdunklungstyp</string> | 27 | <string name="connection_userid">Benutzername</string> |
851 | 28 | <string name="custom_timeout">Setze eigenes Zeitlimit</string> | ||
852 | 29 | <string name="display_blank_summary">Wähle die erforderlichen Ansicht</string> | ||
853 | 30 | <string name="display_desktop">Bildschirmhintergrund anzeigen</string> | ||
854 | 31 | <string name="display_reset">Live-Ansicht anzeigen</string> | ||
855 | 32 | <string name="display_settings">Anzeigeeinstellung</string> | ||
856 | 33 | <string name="display_screen">Abdunkeln</string> | ||
857 | 34 | <string name="display_theme">Nur Design anzeigen</string> | ||
858 | 18 | <string name="enable_custom_timeouts">Aktiviere eigene Time-outs</string> | 35 | <string name="enable_custom_timeouts">Aktiviere eigene Time-outs</string> |
859 | 36 | <string name="enter_alert_text">Hinweis eingeben</string> | ||
860 | 19 | <string name="home">Start</string> | 37 | <string name="home">Start</string> |
861 | 38 | <string name="httpreturn_unauthorised">Zugriff nicht erlaubt, bitte einen gültigen Benutzernamen und das korrekte Passwort eingeben</string> | ||
862 | 39 | <string name="live_list">Live Liste</string> | ||
863 | 40 | <string name="live_view">Echtzeit-Anzeige</string> | ||
864 | 41 | <string name="navigation_drawer_open">Navigationsleiste anzeigen</string> | ||
865 | 42 | <string name="navigation_drawer_close">Navigationsleiste verbergen</string> | ||
866 | 43 | <string name="next">Vorwärts</string> | ||
867 | 20 | <string name="none">Nichts</string> | 44 | <string name="none">Nichts</string> |
868 | 21 | <string name="port">Port</string> | 45 | <string name="port">Port</string> |
869 | 46 | <string name="previous">Zurück</string> | ||
870 | 47 | <string name="process">Verarbeite</string> | ||
871 | 48 | <string name="service_list">Ablaufliste</string> | ||
872 | 49 | <string name="stage_view">Bühnenansicht</string> | ||
873 | 50 | <string name="text_size">Textgröße in der Ansicht auswählen</string> | ||
874 | 22 | <string name="text_size_summary">Textgröße des Ablaufs ändern</string> | 51 | <string name="text_size_summary">Textgröße des Ablaufs ändern</string> |
875 | 23 | <string name="title_activity_settings">Einstellungen</string> | 52 | <string name="title_activity_settings">Einstellungen</string> |
876 | 24 | <string name="url_hint">Hostname oder IP</string> | 53 | <string name="url_hint">Hostname oder IP</string> |
877 | 54 | <string name="unable">Anfrage konnte nicht verarbeitet werden - bitte die Netzwerkeinstellungen überprüfen</string> | ||
878 | 25 | </resources> | 55 | </resources> |
879 | 26 | 56 | ||
880 | === modified file 'app/src/main/res/values-en-rGB/strings.xml' | |||
881 | --- app/src/main/res/values-en-rGB/strings.xml 2015-05-30 05:53:10 +0000 | |||
882 | +++ app/src/main/res/values-en-rGB/strings.xml 2015-10-16 19:35:50 +0000 | |||
883 | @@ -26,25 +26,29 @@ | |||
884 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> |
885 | 27 | <string name="connection_userid">Username</string> | 27 | <string name="connection_userid">Username</string> |
886 | 28 | <string name="custom_timeout">Set Custom Timeout</string> | 28 | <string name="custom_timeout">Set Custom Timeout</string> |
892 | 29 | <string name="display_blank_summary">Select the required blank type</string> | 29 | <string name="display_blank_summary">Select the required display</string> |
893 | 30 | <string name="display_desktop">Blank display to Desktop</string> | 30 | <string name="display_desktop">Display Desktop background</string> |
894 | 31 | <string name="display_reset">Reset Display</string> | 31 | <string name="display_list_autoscroll">Allow the selected item to scroll to the centre of the list</string> |
895 | 32 | <string name="display_screen">Blank display to Blank</string> | 32 | <string name="display_reset">Show Live display</string> |
896 | 33 | <string name="display_theme">Blank display to Theme</string> | 33 | <string name="display_settings">Display Setting</string> |
897 | 34 | <string name="display_screen">Display Black only</string> | ||
898 | 35 | <string name="display_theme">Display Theme only</string> | ||
899 | 34 | <string name="enable_custom_timeouts">Enable Custom Timeouts</string> | 36 | <string name="enable_custom_timeouts">Enable Custom Timeouts</string> |
900 | 35 | <string name="enter_alert_text">Enter Alert Text</string> | 37 | <string name="enter_alert_text">Enter Alert Text</string> |
901 | 38 | <string name="enable_autoscroll">Allow displays to auto center</string> | ||
902 | 36 | <string name="home">Home</string> | 39 | <string name="home">Home</string> |
903 | 37 | <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string> | 40 | <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string> |
904 | 38 | <string name="live_list">Live List</string> | 41 | <string name="live_list">Live List</string> |
906 | 39 | <string name="live_view">LiveView</string> | 42 | <string name="live_view">Live View</string> |
907 | 40 | <string name="navigation_drawer_open">Open navigation drawer</string> | 43 | <string name="navigation_drawer_open">Open navigation drawer</string> |
908 | 41 | <string name="navigation_drawer_close">Close navigation drawer</string> | 44 | <string name="navigation_drawer_close">Close navigation drawer</string> |
909 | 45 | <string name="next">Next</string> | ||
910 | 42 | <string name="none">None</string> | 46 | <string name="none">None</string> |
911 | 43 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
912 | 48 | <string name="previous">Previous</string> | ||
913 | 44 | <string name="process">Process</string> | 49 | <string name="process">Process</string> |
914 | 45 | <string name="service_list">Service List</string> | 50 | <string name="service_list">Service List</string> |
915 | 46 | <string name="stage_view">Stage View</string> | 51 | <string name="stage_view">Stage View</string> |
916 | 47 | <string name="text_size_type">Display Text Size</string> | ||
917 | 48 | <string name="text_size">Select display text size</string> | 52 | <string name="text_size">Select display text size</string> |
918 | 49 | <string name="text_size_summary">Change the Service text size</string> | 53 | <string name="text_size_summary">Change the Service text size</string> |
919 | 50 | <string name="title_activity_settings">Settings</string> | 54 | <string name="title_activity_settings">Settings</string> |
920 | 51 | 55 | ||
921 | === added directory 'app/src/main/res/values-en-rZA' | |||
922 | === added file 'app/src/main/res/values-en-rZA/strings.xml' | |||
923 | --- app/src/main/res/values-en-rZA/strings.xml 1970-01-01 00:00:00 +0000 | |||
924 | +++ app/src/main/res/values-en-rZA/strings.xml 2015-10-16 19:35:50 +0000 | |||
925 | @@ -0,0 +1,57 @@ | |||
926 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
927 | 2 | <resources> | ||
928 | 3 | <string name="about_display_1">OpenLP is free church presentation software</string> | ||
929 | 4 | <string name="about_display_2">To find out more visit the OpenLP website</string> | ||
930 | 5 | <string name="about_display_4">Copyright</string> | ||
931 | 6 | <string name="about_display_5">Portions copyright</string> | ||
932 | 7 | <string name="about_display_6">License</string> | ||
933 | 8 | <string name="about_display_7">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License</string> | ||
934 | 9 | <string name="about_display_8">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE</string> | ||
935 | 10 | <string name="action_settings">Settings</string> | ||
936 | 11 | <string name="action_about">About</string> | ||
937 | 12 | <string name="action_alert">Alert</string> | ||
938 | 13 | <string name="action_back">Back</string> | ||
939 | 14 | <string name="action_blank">Toggle Display</string> | ||
940 | 15 | <string name="action_preferences">Preferences</string> | ||
941 | 16 | <string name="action_refresh">Refresh</string> | ||
942 | 17 | <string name="action_search">Search</string> | ||
943 | 18 | <string name="app_name">OpenLP</string> | ||
944 | 19 | <string name="cancel">Cancel</string> | ||
945 | 20 | <string name="connection_configuration">Configure Network</string> | ||
946 | 21 | <string name="connection_password">Password</string> | ||
947 | 22 | <string name="connection_profile">Server Details</string> | ||
948 | 23 | <string name="connection_profile_ssl_use">Use HTTPS</string> | ||
949 | 24 | <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string> | ||
950 | 25 | <string name="connection_timeout">Connection Timeout</string> | ||
951 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | ||
952 | 27 | <string name="connection_userid">Username</string> | ||
953 | 28 | <string name="custom_timeout">Set Custom Timeout</string> | ||
954 | 29 | <string name="display_blank_summary">Select the required display</string> | ||
955 | 30 | <string name="display_desktop">Display Desktop background</string> | ||
956 | 31 | <string name="display_list_autoscroll">Allow the selected item to scroll to the centre of the list</string> | ||
957 | 32 | <string name="display_reset">Show Live display</string> | ||
958 | 33 | <string name="display_settings">Display Setting</string> | ||
959 | 34 | <string name="display_screen">Display Black only</string> | ||
960 | 35 | <string name="display_theme">Display Theme only</string> | ||
961 | 36 | <string name="enable_custom_timeouts">Enable Custom Timeouts</string> | ||
962 | 37 | <string name="enter_alert_text">Enter Alert Text</string> | ||
963 | 38 | <string name="enable_autoscroll">Allow displays to auto centre</string> | ||
964 | 39 | <string name="home">Home</string> | ||
965 | 40 | <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string> | ||
966 | 41 | <string name="live_list">Live List</string> | ||
967 | 42 | <string name="live_view">Live View</string> | ||
968 | 43 | <string name="navigation_drawer_open">Open navigation drawer</string> | ||
969 | 44 | <string name="navigation_drawer_close">Close navigation drawer</string> | ||
970 | 45 | <string name="next">Next</string> | ||
971 | 46 | <string name="none">None</string> | ||
972 | 47 | <string name="port">Port</string> | ||
973 | 48 | <string name="previous">Previous</string> | ||
974 | 49 | <string name="process">Process</string> | ||
975 | 50 | <string name="service_list">Service List</string> | ||
976 | 51 | <string name="stage_view">Stage View</string> | ||
977 | 52 | <string name="text_size">Select display text size</string> | ||
978 | 53 | <string name="text_size_summary">Change the Service text size</string> | ||
979 | 54 | <string name="title_activity_settings">Settings</string> | ||
980 | 55 | <string name="url_hint">Hostname or IP</string> | ||
981 | 56 | <string name="unable">Unable to process request - check network settings</string> | ||
982 | 57 | </resources> | ||
983 | 0 | 58 | ||
984 | === removed directory 'app/src/main/res/values-en_rZA' | |||
985 | === removed file 'app/src/main/res/values-en_rZA/strings.xml' | |||
986 | --- app/src/main/res/values-en_rZA/strings.xml 2015-05-30 05:53:10 +0000 | |||
987 | +++ app/src/main/res/values-en_rZA/strings.xml 1970-01-01 00:00:00 +0000 | |||
988 | @@ -1,53 +0,0 @@ | |||
989 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
990 | 2 | <resources> | ||
991 | 3 | <string name="about_display_1">OpenLP is free church presentation software</string> | ||
992 | 4 | <string name="about_display_2">To find out more visit the OpenLP website</string> | ||
993 | 5 | <string name="about_display_4">Copyright</string> | ||
994 | 6 | <string name="about_display_5">Portions copyright</string> | ||
995 | 7 | <string name="about_display_6">License</string> | ||
996 | 8 | <string name="about_display_7">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License</string> | ||
997 | 9 | <string name="about_display_8">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE</string> | ||
998 | 10 | <string name="action_settings">Settings</string> | ||
999 | 11 | <string name="action_about">About</string> | ||
1000 | 12 | <string name="action_alert">Alert</string> | ||
1001 | 13 | <string name="action_back">Back</string> | ||
1002 | 14 | <string name="action_blank">Toggle Display</string> | ||
1003 | 15 | <string name="action_preferences">Preferences</string> | ||
1004 | 16 | <string name="action_refresh">Refresh</string> | ||
1005 | 17 | <string name="action_search">Search</string> | ||
1006 | 18 | <string name="app_name">OpenLP</string> | ||
1007 | 19 | <string name="cancel">Cancel</string> | ||
1008 | 20 | <string name="connection_configuration">Configure Network</string> | ||
1009 | 21 | <string name="connection_password">Password</string> | ||
1010 | 22 | <string name="connection_profile">Server Details</string> | ||
1011 | 23 | <string name="connection_profile_ssl_use">Use HTTPS</string> | ||
1012 | 24 | <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string> | ||
1013 | 25 | <string name="connection_timeout">Connection Timeout</string> | ||
1014 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | ||
1015 | 27 | <string name="connection_userid">Username</string> | ||
1016 | 28 | <string name="custom_timeout">Set Custom Timeout</string> | ||
1017 | 29 | <string name="display_blank_summary">Select the required blank type</string> | ||
1018 | 30 | <string name="display_desktop">Blank display to Desktop</string> | ||
1019 | 31 | <string name="display_reset">Reset Display</string> | ||
1020 | 32 | <string name="display_screen">Blank display to Blank</string> | ||
1021 | 33 | <string name="display_theme">Blank display to Theme</string> | ||
1022 | 34 | <string name="enable_custom_timeouts">Enable Custom Timeouts</string> | ||
1023 | 35 | <string name="enter_alert_text">Enter Alert Text</string> | ||
1024 | 36 | <string name="home">Home</string> | ||
1025 | 37 | <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string> | ||
1026 | 38 | <string name="live_list">Live List</string> | ||
1027 | 39 | <string name="live_view">LiveView</string> | ||
1028 | 40 | <string name="navigation_drawer_open">Open navigation drawer</string> | ||
1029 | 41 | <string name="navigation_drawer_close">Close navigation drawer</string> | ||
1030 | 42 | <string name="none">None</string> | ||
1031 | 43 | <string name="port">Port</string> | ||
1032 | 44 | <string name="process">Process</string> | ||
1033 | 45 | <string name="service_list">Service List</string> | ||
1034 | 46 | <string name="stage_view">Stage View</string> | ||
1035 | 47 | <string name="text_size_type">Display Text Size</string> | ||
1036 | 48 | <string name="text_size">Select display text size</string> | ||
1037 | 49 | <string name="text_size_summary">Change the Service text size</string> | ||
1038 | 50 | <string name="title_activity_settings">Settings</string> | ||
1039 | 51 | <string name="url_hint">Hostname or IP</string> | ||
1040 | 52 | <string name="unable">Unable to process request - check network settings</string> | ||
1041 | 53 | </resources> | ||
1042 | 54 | 0 | ||
1043 | === modified file 'app/src/main/res/values-es/strings.xml' | |||
1044 | --- app/src/main/res/values-es/strings.xml 2015-05-30 05:53:10 +0000 | |||
1045 | +++ app/src/main/res/values-es/strings.xml 2015-10-16 19:35:50 +0000 | |||
1046 | @@ -6,14 +6,14 @@ | |||
1047 | 6 | <string name="about_display_5">Partes copyright</string> | 6 | <string name="about_display_5">Partes copyright</string> |
1048 | 7 | <string name="about_display_6">Licencia</string> | 7 | <string name="about_display_6">Licencia</string> |
1049 | 8 | <string name="about_display_7">Este es un programa gratuito; usted puede distribuirlo y/o modificarlo bajo los términos de GNU General Public License según la publicación de Free Software Foundation; versión 2 de la Licencia.</string> | 8 | <string name="about_display_7">Este es un programa gratuito; usted puede distribuirlo y/o modificarlo bajo los términos de GNU General Public License según la publicación de Free Software Foundation; versión 2 de la Licencia.</string> |
1051 | 9 | <string name="about_display_8">Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Véase más abajo para más detalles.</string> | 9 | <string name="about_display_8">Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.</string> |
1052 | 10 | <string name="action_settings">Preferencias</string> | 10 | <string name="action_settings">Preferencias</string> |
1053 | 11 | <string name="action_about">Acerca de</string> | 11 | <string name="action_about">Acerca de</string> |
1054 | 12 | <string name="action_alert">Alerta</string> | 12 | <string name="action_alert">Alerta</string> |
1055 | 13 | <string name="action_back">Atrás</string> | 13 | <string name="action_back">Atrás</string> |
1056 | 14 | <string name="action_blank">Alternar Pantalla</string> | 14 | <string name="action_blank">Alternar Pantalla</string> |
1057 | 15 | <string name="action_preferences">Preferencias</string> | 15 | <string name="action_preferences">Preferencias</string> |
1059 | 16 | <string name="action_refresh">Refrezcar</string> | 16 | <string name="action_refresh">Actualizar</string> |
1060 | 17 | <string name="action_search">Buscar</string> | 17 | <string name="action_search">Buscar</string> |
1061 | 18 | <string name="app_name">OpenLP</string> | 18 | <string name="app_name">OpenLP</string> |
1062 | 19 | <string name="cancel">Cancelar</string> | 19 | <string name="cancel">Cancelar</string> |
1063 | @@ -24,17 +24,29 @@ | |||
1064 | 24 | <string name="connection_profile_ssl_summary">Especificar si se debe usar HTTPS</string> | 24 | <string name="connection_profile_ssl_summary">Especificar si se debe usar HTTPS</string> |
1065 | 25 | <string name="connection_timeout">Tiempo de espera de conexión</string> | 25 | <string name="connection_timeout">Tiempo de espera de conexión</string> |
1066 | 26 | <string name="connection_timeout_summary">Seleccione un valor (en milisegundos)</string> | 26 | <string name="connection_timeout_summary">Seleccione un valor (en milisegundos)</string> |
1067 | 27 | <string name="connection_userid">Usuario</string> | ||
1068 | 27 | <string name="custom_timeout">Tiempo de espera personalizado</string> | 28 | <string name="custom_timeout">Tiempo de espera personalizado</string> |
1071 | 28 | <string name="display_blank_summary">Seleccione el tipo de blanco que necesite</string> | 29 | <string name="display_blank_summary">Seleccionar la pantalla requerida</string> |
1072 | 29 | <string name="display_reset">Restablecer Pantalla</string> | 30 | <string name="display_desktop">Mostrar Fondo del Escritorio</string> |
1073 | 31 | <string name="display_reset">Mostrar pantalla En Vivo</string> | ||
1074 | 32 | <string name="display_settings">Preferencias de pantalla</string> | ||
1075 | 33 | <string name="display_screen">Mostrar Negro solamente</string> | ||
1076 | 34 | <string name="display_theme">Mostrar Tema solamente</string> | ||
1077 | 30 | <string name="enable_custom_timeouts">Permitir tiempos de espera personalizados</string> | 35 | <string name="enable_custom_timeouts">Permitir tiempos de espera personalizados</string> |
1078 | 31 | <string name="enter_alert_text">Ingrese Texto de Alerta</string> | 36 | <string name="enter_alert_text">Ingrese Texto de Alerta</string> |
1079 | 32 | <string name="home">Inicio</string> | 37 | <string name="home">Inicio</string> |
1080 | 38 | <string name="httpreturn_unauthorised">Acceso No Autorizado, ingrese usuario y clave válidos</string> | ||
1081 | 39 | <string name="live_list">Lista En Vivo</string> | ||
1082 | 33 | <string name="navigation_drawer_open">Abrir cajón de navegación</string> | 40 | <string name="navigation_drawer_open">Abrir cajón de navegación</string> |
1083 | 34 | <string name="navigation_drawer_close">Cerrar cajón de navegación</string> | 41 | <string name="navigation_drawer_close">Cerrar cajón de navegación</string> |
1084 | 42 | <string name="next">Siguiente</string> | ||
1085 | 35 | <string name="none">Ninguno</string> | 43 | <string name="none">Ninguno</string> |
1086 | 36 | <string name="port">Puerto</string> | 44 | <string name="port">Puerto</string> |
1087 | 45 | <string name="previous">Anterior</string> | ||
1088 | 46 | <string name="process">Procesar</string> | ||
1089 | 47 | <string name="service_list">Lista de Servicio</string> | ||
1090 | 37 | <string name="stage_view">Vista de Escenario</string> | 48 | <string name="stage_view">Vista de Escenario</string> |
1091 | 49 | <string name="text_size">Seleccione tamaño del texto</string> | ||
1092 | 38 | <string name="text_size_summary">Cambia el tamaño de texto del Servicio</string> | 50 | <string name="text_size_summary">Cambia el tamaño de texto del Servicio</string> |
1093 | 39 | <string name="title_activity_settings">Preferencias</string> | 51 | <string name="title_activity_settings">Preferencias</string> |
1094 | 40 | <string name="url_hint">Nombre de host o IP</string> | 52 | <string name="url_hint">Nombre de host o IP</string> |
1095 | 41 | 53 | ||
1096 | === modified file 'app/src/main/res/values-et/strings.xml' | |||
1097 | --- app/src/main/res/values-et/strings.xml 2015-05-30 05:53:10 +0000 | |||
1098 | +++ app/src/main/res/values-et/strings.xml 2015-10-16 19:35:50 +0000 | |||
1099 | @@ -1,5 +1,7 @@ | |||
1100 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
1101 | 2 | <resources> | 2 | <resources> |
1102 | 3 | <string name="about_display_1">OpenLP on vaba kiriku esitlustarkvara</string> | ||
1103 | 4 | <string name="about_display_2">Rohkem saab teada OpenLP veebilehelt</string> | ||
1104 | 3 | <string name="about_display_4">Autoriõigused</string> | 5 | <string name="about_display_4">Autoriõigused</string> |
1105 | 4 | <string name="about_display_5">Osalised autoriõigused</string> | 6 | <string name="about_display_5">Osalised autoriõigused</string> |
1106 | 5 | <string name="about_display_6">Litsents</string> | 7 | <string name="about_display_6">Litsents</string> |
1107 | @@ -7,19 +9,45 @@ | |||
1108 | 7 | <string name="action_about">Rakendusest</string> | 9 | <string name="action_about">Rakendusest</string> |
1109 | 8 | <string name="action_alert">Teade</string> | 10 | <string name="action_alert">Teade</string> |
1110 | 9 | <string name="action_back">Tagasi</string> | 11 | <string name="action_back">Tagasi</string> |
1111 | 12 | <string name="action_blank">Kuva vahetus</string> | ||
1112 | 10 | <string name="action_preferences">Eelistused</string> | 13 | <string name="action_preferences">Eelistused</string> |
1113 | 11 | <string name="action_refresh">Värskenda</string> | 14 | <string name="action_refresh">Värskenda</string> |
1114 | 12 | <string name="action_search">Otsi</string> | 15 | <string name="action_search">Otsi</string> |
1115 | 13 | <string name="app_name">OpenLP</string> | 16 | <string name="app_name">OpenLP</string> |
1116 | 14 | <string name="cancel">Loobu</string> | 17 | <string name="cancel">Loobu</string> |
1117 | 18 | <string name="connection_configuration">Seadista võrk</string> | ||
1118 | 19 | <string name="connection_password">Parool</string> | ||
1119 | 20 | <string name="connection_profile">Serveri andmed</string> | ||
1120 | 21 | <string name="connection_profile_ssl_use">HTTPSi kasutamine</string> | ||
1121 | 22 | <string name="connection_profile_ssl_summary">Määra, kas kasutada tuleks HTTPSi kaudu ühendust</string> | ||
1122 | 15 | <string name="connection_timeout">Ühenduse aegumine</string> | 23 | <string name="connection_timeout">Ühenduse aegumine</string> |
1123 | 16 | <string name="connection_timeout_summary">Vali kestus (millisekundid)</string> | 24 | <string name="connection_timeout_summary">Vali kestus (millisekundid)</string> |
1125 | 17 | <string name="display_blank_summary">Vali kuva tühjendamise liik</string> | 25 | <string name="connection_userid">Kasutajanimi</string> |
1126 | 26 | <string name="custom_timeout">Päringu aegumine</string> | ||
1127 | 27 | <string name="display_blank_summary">Vali nõutud kuva</string> | ||
1128 | 28 | <string name="display_desktop">Töölaua tausta näitamine</string> | ||
1129 | 29 | <string name="display_reset">Laivi kuva</string> | ||
1130 | 30 | <string name="display_settings">Kuvasätted</string> | ||
1131 | 31 | <string name="display_screen">Kuva musta</string> | ||
1132 | 32 | <string name="display_theme">Kuva ainult teemat</string> | ||
1133 | 18 | <string name="enable_custom_timeouts">Kohandatud aegumisegade kasutamine</string> | 33 | <string name="enable_custom_timeouts">Kohandatud aegumisegade kasutamine</string> |
1134 | 34 | <string name="enter_alert_text">Hoiatuse tekst</string> | ||
1135 | 35 | <string name="enable_autoscroll">Kuvad võivad automaatselt paigutuda keskele</string> | ||
1136 | 19 | <string name="home">Kodu</string> | 36 | <string name="home">Kodu</string> |
1137 | 37 | <string name="httpreturn_unauthorised">Lubamatu ligipääs, palun sisesta õiged kasutajanimi ja parool.</string> | ||
1138 | 38 | <string name="live_list">Ekraanil</string> | ||
1139 | 39 | <string name="navigation_drawer_open">Ava navisahtel</string> | ||
1140 | 40 | <string name="navigation_drawer_close">Sulge navisahtel</string> | ||
1141 | 41 | <string name="next">Järgmine</string> | ||
1142 | 20 | <string name="none">Puudub</string> | 42 | <string name="none">Puudub</string> |
1143 | 21 | <string name="port">Port</string> | 43 | <string name="port">Port</string> |
1144 | 44 | <string name="previous">Eelmine</string> | ||
1145 | 45 | <string name="process">Töötlemine</string> | ||
1146 | 46 | <string name="service_list">Teenistuste loend</string> | ||
1147 | 47 | <string name="stage_view">Lavavaade</string> | ||
1148 | 48 | <string name="text_size">Teksti suurus</string> | ||
1149 | 22 | <string name="text_size_summary">Vaikimisi teenistuse teksti suuruse muutmine</string> | 49 | <string name="text_size_summary">Vaikimisi teenistuse teksti suuruse muutmine</string> |
1150 | 23 | <string name="title_activity_settings">Sätted</string> | 50 | <string name="title_activity_settings">Sätted</string> |
1151 | 24 | <string name="url_hint">Hostinimi või IP</string> | 51 | <string name="url_hint">Hostinimi või IP</string> |
1152 | 52 | <string name="unable">Päringu töötlemine on võimatu - kontrolli võrgusätteid</string> | ||
1153 | 25 | </resources> | 53 | </resources> |
1154 | 26 | 54 | ||
1155 | === modified file 'app/src/main/res/values-fi/strings.xml' | |||
1156 | --- app/src/main/res/values-fi/strings.xml 2015-05-30 05:53:10 +0000 | |||
1157 | +++ app/src/main/res/values-fi/strings.xml 2015-10-16 19:35:50 +0000 | |||
1158 | @@ -9,9 +9,9 @@ | |||
1159 | 9 | <string name="about_display_8">Tätä ohjelmaa levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen.</string> | 9 | <string name="about_display_8">Tätä ohjelmaa levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen.</string> |
1160 | 10 | <string name="action_settings">Asetukset</string> | 10 | <string name="action_settings">Asetukset</string> |
1161 | 11 | <string name="action_about">Tietoja</string> | 11 | <string name="action_about">Tietoja</string> |
1163 | 12 | <string name="action_alert">Hälytys</string> | 12 | <string name="action_alert">Huomioviesti</string> |
1164 | 13 | <string name="action_back">Takaisin</string> | 13 | <string name="action_back">Takaisin</string> |
1166 | 14 | <string name="action_blank">Vaihda näyttö</string> | 14 | <string name="action_blank">Näytä tai piilota näyttö</string> |
1167 | 15 | <string name="action_preferences">Asetukset</string> | 15 | <string name="action_preferences">Asetukset</string> |
1168 | 16 | <string name="action_refresh">Päivitä</string> | 16 | <string name="action_refresh">Päivitä</string> |
1169 | 17 | <string name="action_search">Etsi</string> | 17 | <string name="action_search">Etsi</string> |
1170 | @@ -26,25 +26,29 @@ | |||
1171 | 26 | <string name="connection_timeout_summary">Valitse arvo (millisekuntia)</string> | 26 | <string name="connection_timeout_summary">Valitse arvo (millisekuntia)</string> |
1172 | 27 | <string name="connection_userid">Käyttäjätunnus</string> | 27 | <string name="connection_userid">Käyttäjätunnus</string> |
1173 | 28 | <string name="custom_timeout">Säädä mukautettu aikakatkaisu</string> | 28 | <string name="custom_timeout">Säädä mukautettu aikakatkaisu</string> |
1179 | 29 | <string name="display_blank_summary">Valitse pimennyksen tyyppi</string> | 29 | <string name="display_blank_summary">Valitse vaadittu näyttölaite</string> |
1180 | 30 | <string name="display_desktop">Pimennä näyttö työpöydälle</string> | 30 | <string name="display_desktop">Näytä työpöydän tausta</string> |
1181 | 31 | <string name="display_reset">Nollaa näyttö</string> | 31 | <string name="display_list_autoscroll">Salli valittavan nimikkeen vierittäminen luettelon keskimmäiseksi</string> |
1182 | 32 | <string name="display_screen">Pimennä näyttö tyhjäksi</string> | 32 | <string name="display_reset">Näytä Esitys näyttö</string> |
1183 | 33 | <string name="display_theme">Pimennä näyttö teeman mukaiseksi</string> | 33 | <string name="display_settings">Näytön asetukset</string> |
1184 | 34 | <string name="display_screen">Näytä vain pimennys</string> | ||
1185 | 35 | <string name="display_theme">Näytä vain teema</string> | ||
1186 | 34 | <string name="enable_custom_timeouts">Salli mukautetut viiveet</string> | 36 | <string name="enable_custom_timeouts">Salli mukautetut viiveet</string> |
1188 | 35 | <string name="enter_alert_text">Syötä hälytysviesti tähän</string> | 37 | <string name="enter_alert_text">Kirjoita huomioviesti tähän</string> |
1189 | 38 | <string name="enable_autoscroll">Salli näyttöjen automaattinen keskitys</string> | ||
1190 | 36 | <string name="home">Koti</string> | 39 | <string name="home">Koti</string> |
1191 | 37 | <string name="httpreturn_unauthorised">Ei pääsyä, ole hyvä ja anna kelvollinen käyttäjätunnus ja salasana</string> | 40 | <string name="httpreturn_unauthorised">Ei pääsyä, ole hyvä ja anna kelvollinen käyttäjätunnus ja salasana</string> |
1194 | 38 | <string name="live_list">Esitysluettelo</string> | 41 | <string name="live_list">Lista</string> |
1195 | 39 | <string name="live_view">Esitysnäyttö</string> | 42 | <string name="live_view">Esitysnäkymä</string> |
1196 | 40 | <string name="navigation_drawer_open">Avaa navigointi</string> | 43 | <string name="navigation_drawer_open">Avaa navigointi</string> |
1197 | 41 | <string name="navigation_drawer_close">Sulje navigointi</string> | 44 | <string name="navigation_drawer_close">Sulje navigointi</string> |
1198 | 45 | <string name="next">Seuraava</string> | ||
1199 | 42 | <string name="none">Ei mitään</string> | 46 | <string name="none">Ei mitään</string> |
1200 | 43 | <string name="port">Portti</string> | 47 | <string name="port">Portti</string> |
1201 | 48 | <string name="previous">Edellinen</string> | ||
1202 | 44 | <string name="process">Prosessoi</string> | 49 | <string name="process">Prosessoi</string> |
1203 | 45 | <string name="service_list">Palveluluettelo</string> | 50 | <string name="service_list">Palveluluettelo</string> |
1206 | 46 | <string name="stage_view">Näyttölavan näyttö</string> | 51 | <string name="stage_view">Lavanäyttö</string> |
1205 | 47 | <string name="text_size_type">Näyttötekstin koko</string> | ||
1207 | 48 | <string name="text_size">Valitse näyttötekstin koko</string> | 52 | <string name="text_size">Valitse näyttötekstin koko</string> |
1208 | 49 | <string name="text_size_summary">Vaihda palvelun tekstikokoa</string> | 53 | <string name="text_size_summary">Vaihda palvelun tekstikokoa</string> |
1209 | 50 | <string name="title_activity_settings">Asetukset</string> | 54 | <string name="title_activity_settings">Asetukset</string> |
1210 | 51 | 55 | ||
1211 | === modified file 'app/src/main/res/values-hu/strings.xml' | |||
1212 | --- app/src/main/res/values-hu/strings.xml 2015-05-30 05:53:10 +0000 | |||
1213 | +++ app/src/main/res/values-hu/strings.xml 2015-10-16 19:35:50 +0000 | |||
1214 | @@ -26,25 +26,29 @@ | |||
1215 | 26 | <string name="connection_timeout_summary">Válassz egy értéket (milliszekundum)</string> | 26 | <string name="connection_timeout_summary">Válassz egy értéket (milliszekundum)</string> |
1216 | 27 | <string name="connection_userid">Felhasználói név</string> | 27 | <string name="connection_userid">Felhasználói név</string> |
1217 | 28 | <string name="custom_timeout">Egyéni időtúllépés beállítása</string> | 28 | <string name="custom_timeout">Egyéni időtúllépés beállítása</string> |
1223 | 29 | <string name="display_blank_summary">Válaszd ki a kívánt elsötétítési módot</string> | 29 | <string name="display_blank_summary">Válaszd ki a kívánt megjelenést</string> |
1224 | 30 | <string name="display_desktop">Asztal megjelenítése</string> | 30 | <string name="display_desktop">Asztal hátterének megjelenítése</string> |
1225 | 31 | <string name="display_reset">Képernyő visszaállítása</string> | 31 | <string name="display_list_autoscroll">Görgetés a lista közepére a kijelölt elemhez</string> |
1226 | 32 | <string name="display_screen">Képernyő elsötétítése</string> | 32 | <string name="display_reset">Élő adás megjelenítése</string> |
1227 | 33 | <string name="display_theme">Elsötétítés a témára</string> | 33 | <string name="display_settings">Megjelenítési beállítás</string> |
1228 | 34 | <string name="display_screen">Elsötétített képernyő megjelenítése</string> | ||
1229 | 35 | <string name="display_theme">Téma megjelenítése</string> | ||
1230 | 34 | <string name="enable_custom_timeouts">Egyéni időtúllépés engedélyezése</string> | 36 | <string name="enable_custom_timeouts">Egyéni időtúllépés engedélyezése</string> |
1231 | 35 | <string name="enter_alert_text">Riasztási üzenet megadása</string> | 37 | <string name="enter_alert_text">Riasztási üzenet megadása</string> |
1232 | 38 | <string name="enable_autoscroll">Megjelenés automatikus középre igazítása</string> | ||
1233 | 36 | <string name="home">Kezdőlap</string> | 39 | <string name="home">Kezdőlap</string> |
1234 | 37 | <string name="httpreturn_unauthorised">Engedély nélküli hozzáférés, adjon meg érvényes felhasználói nevet és jelszót</string> | 40 | <string name="httpreturn_unauthorised">Engedély nélküli hozzáférés, adjon meg érvényes felhasználói nevet és jelszót</string> |
1235 | 38 | <string name="live_list">Élő lista</string> | 41 | <string name="live_list">Élő lista</string> |
1236 | 39 | <string name="live_view">Élő nézet</string> | 42 | <string name="live_view">Élő nézet</string> |
1237 | 40 | <string name="navigation_drawer_open">Menü megnyitása</string> | 43 | <string name="navigation_drawer_open">Menü megnyitása</string> |
1238 | 41 | <string name="navigation_drawer_close">Menü bezárása</string> | 44 | <string name="navigation_drawer_close">Menü bezárása</string> |
1239 | 45 | <string name="next">Következő</string> | ||
1240 | 42 | <string name="none">Nincs</string> | 46 | <string name="none">Nincs</string> |
1241 | 43 | <string name="port">Portszám</string> | 47 | <string name="port">Portszám</string> |
1242 | 48 | <string name="previous">Előző</string> | ||
1243 | 44 | <string name="process">Folyamatban</string> | 49 | <string name="process">Folyamatban</string> |
1244 | 45 | <string name="service_list">Sorrend</string> | 50 | <string name="service_list">Sorrend</string> |
1245 | 46 | <string name="stage_view">Színpadi nézet</string> | 51 | <string name="stage_view">Színpadi nézet</string> |
1246 | 47 | <string name="text_size_type">Megjelenítés betűmérete</string> | ||
1247 | 48 | <string name="text_size">Betűméret választása</string> | 52 | <string name="text_size">Betűméret választása</string> |
1248 | 49 | <string name="text_size_summary">Sorrend betűméretének módosítása</string> | 53 | <string name="text_size_summary">Sorrend betűméretének módosítása</string> |
1249 | 50 | <string name="title_activity_settings">Beállítások</string> | 54 | <string name="title_activity_settings">Beállítások</string> |
1250 | 51 | 55 | ||
1251 | === modified file 'app/src/main/res/values-id/strings.xml' | |||
1252 | --- app/src/main/res/values-id/strings.xml 2015-05-30 05:53:10 +0000 | |||
1253 | +++ app/src/main/res/values-id/strings.xml 2015-10-16 19:35:50 +0000 | |||
1254 | @@ -26,25 +26,25 @@ | |||
1255 | 26 | <string name="connection_timeout_summary">Pilih sebuah nilai (milidetik)</string> | 26 | <string name="connection_timeout_summary">Pilih sebuah nilai (milidetik)</string> |
1256 | 27 | <string name="connection_userid">Nama Pengguna</string> | 27 | <string name="connection_userid">Nama Pengguna</string> |
1257 | 28 | <string name="custom_timeout">Setel Batas-waktu Kustom</string> | 28 | <string name="custom_timeout">Setel Batas-waktu Kustom</string> |
1263 | 29 | <string name="display_blank_summary">Pilih jenis kosong yang dibutuhkan</string> | 29 | <string name="display_blank_summary">Pilih tampilan yang dibutuhkan</string> |
1264 | 30 | <string name="display_desktop">Kosongkan tampilan jadi Desktop</string> | 30 | <string name="display_desktop">Tampilkan latar Desktop</string> |
1265 | 31 | <string name="display_reset">Setel-ulang Tampilan</string> | 31 | <string name="display_reset">Tampilkan tampilan Tayang</string> |
1266 | 32 | <string name="display_screen">Kosongkan tampilan jadi Kosong</string> | 32 | <string name="display_screen">Tampilkan Layar Hitam saja</string> |
1267 | 33 | <string name="display_theme">Kosongkan tampilan jadi Tema</string> | 33 | <string name="display_theme">Tampilkan Tema saja</string> |
1268 | 34 | <string name="enable_custom_timeouts">Aktifkan Batas-Waktu Kustom</string> | 34 | <string name="enable_custom_timeouts">Aktifkan Batas-Waktu Kustom</string> |
1269 | 35 | <string name="enter_alert_text">Masukkan Teks Peringatan</string> | 35 | <string name="enter_alert_text">Masukkan Teks Peringatan</string> |
1270 | 36 | <string name="home">Beranda</string> | 36 | <string name="home">Beranda</string> |
1271 | 37 | <string name="httpreturn_unauthorised">Akses Tidak sah, silakan masukkan nama pengguna dan kata sandi yang valid</string> | 37 | <string name="httpreturn_unauthorised">Akses Tidak sah, silakan masukkan nama pengguna dan kata sandi yang valid</string> |
1272 | 38 | <string name="live_list">Daftar Tayang</string> | 38 | <string name="live_list">Daftar Tayang</string> |
1273 | 39 | <string name="live_view">Tinjauan Tayang</string> | ||
1274 | 40 | <string name="navigation_drawer_open">Buka penarik navigasi</string> | 39 | <string name="navigation_drawer_open">Buka penarik navigasi</string> |
1275 | 41 | <string name="navigation_drawer_close">Tutup penarik navigasi</string> | 40 | <string name="navigation_drawer_close">Tutup penarik navigasi</string> |
1276 | 41 | <string name="next">Selanjutnya</string> | ||
1277 | 42 | <string name="none">Tidak sama sekali</string> | 42 | <string name="none">Tidak sama sekali</string> |
1278 | 43 | <string name="port">Port</string> | 43 | <string name="port">Port</string> |
1279 | 44 | <string name="previous">Sebelumnya</string> | ||
1280 | 44 | <string name="process">Proses</string> | 45 | <string name="process">Proses</string> |
1281 | 45 | <string name="service_list">Daftar Layanan</string> | 46 | <string name="service_list">Daftar Layanan</string> |
1282 | 46 | <string name="stage_view">Tinjuan Bertahap</string> | 47 | <string name="stage_view">Tinjuan Bertahap</string> |
1283 | 47 | <string name="text_size_type">Tampilkan Ukuran Teks</string> | ||
1284 | 48 | <string name="text_size">Pilih tampilan ukuran teks</string> | 48 | <string name="text_size">Pilih tampilan ukuran teks</string> |
1285 | 49 | <string name="text_size_summary">Ubah ukuran teks Layanan</string> | 49 | <string name="text_size_summary">Ubah ukuran teks Layanan</string> |
1286 | 50 | <string name="title_activity_settings">Setelan</string> | 50 | <string name="title_activity_settings">Setelan</string> |
1287 | 51 | 51 | ||
1288 | === removed directory 'app/src/main/res/values-ko_rKR' | |||
1289 | === removed file 'app/src/main/res/values-ko_rKR/strings.xml' | |||
1290 | --- app/src/main/res/values-ko_rKR/strings.xml 2015-05-30 05:53:10 +0000 | |||
1291 | +++ app/src/main/res/values-ko_rKR/strings.xml 1970-01-01 00:00:00 +0000 | |||
1292 | @@ -1,9 +0,0 @@ | |||
1293 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1294 | 2 | <resources> | ||
1295 | 3 | <string name="action_settings">설정</string> | ||
1296 | 4 | <string name="action_preferences">환경설정</string> | ||
1297 | 5 | <string name="app_name">OpenLP</string> | ||
1298 | 6 | <string name="port">포트</string> | ||
1299 | 7 | <string name="title_activity_settings">설정</string> | ||
1300 | 8 | <string name="url_hint">Hostname or IP</string> | ||
1301 | 9 | </resources> | ||
1302 | 10 | 0 | ||
1303 | === modified file 'app/src/main/res/values-lt/strings.xml' | |||
1304 | --- app/src/main/res/values-lt/strings.xml 2015-05-30 05:53:10 +0000 | |||
1305 | +++ app/src/main/res/values-lt/strings.xml 2015-10-16 19:35:50 +0000 | |||
1306 | @@ -3,6 +3,7 @@ | |||
1307 | 3 | <string name="about_display_1">OpenLP yra, bažnyčioms skirta, nemokama pristatymų programinė įranga</string> | 3 | <string name="about_display_1">OpenLP yra, bažnyčioms skirta, nemokama pristatymų programinė įranga</string> |
1308 | 4 | <string name="about_display_2">Norėdami sužinoti daugiau, aplankykite OpenLP svetainę</string> | 4 | <string name="about_display_2">Norėdami sužinoti daugiau, aplankykite OpenLP svetainę</string> |
1309 | 5 | <string name="about_display_4">Autorių Teisės</string> | 5 | <string name="about_display_4">Autorių Teisės</string> |
1310 | 6 | <string name="about_display_5">Autorių Teisių dalys</string> | ||
1311 | 6 | <string name="about_display_6">Licencija</string> | 7 | <string name="about_display_6">Licencija</string> |
1312 | 7 | <string name="about_display_7">Ši programa yra nemokama programinė įranga; jūs galite ją platinti ir/arba modifikuoti remdamiesi Free Software Foundation paskelbtomis GNU Bendrosios Viešosios Licencijos sąlygomis; licencijos 2 versija.</string> | 8 | <string name="about_display_7">Ši programa yra nemokama programinė įranga; jūs galite ją platinti ir/arba modifikuoti remdamiesi Free Software Foundation paskelbtomis GNU Bendrosios Viešosios Licencijos sąlygomis; licencijos 2 versija.</string> |
1313 | 8 | <string name="about_display_8">Ši programa platinama, tikintis, kad ji bus naudinga, tačiau BE JOKIŲ GARANTIJŲ; netgi be numanomos PARDAVIMO ar TINKAMUMO TAM TIKRAM TIKSLUI GARANTIJOS</string> | 9 | <string name="about_display_8">Ši programa platinama, tikintis, kad ji bus naudinga, tačiau BE JOKIŲ GARANTIJŲ; netgi be numanomos PARDAVIMO ar TINKAMUMO TAM TIKRAM TIKSLUI GARANTIJOS</string> |
1314 | @@ -25,22 +26,29 @@ | |||
1315 | 25 | <string name="connection_timeout_summary">Pasirinkite reikšmę (milisekundėmis)</string> | 26 | <string name="connection_timeout_summary">Pasirinkite reikšmę (milisekundėmis)</string> |
1316 | 26 | <string name="connection_userid">Vartotojo vardas</string> | 27 | <string name="connection_userid">Vartotojo vardas</string> |
1317 | 27 | <string name="custom_timeout">Nustatyti Pasirinktiną Laukimo Laiką</string> | 28 | <string name="custom_timeout">Nustatyti Pasirinktiną Laukimo Laiką</string> |
1323 | 28 | <string name="display_blank_summary">Pasirinkite reikiamą uždengimo tipą</string> | 29 | <string name="display_blank_summary">Pasirinkite reikiamą ekraną</string> |
1324 | 29 | <string name="display_desktop">Rodyti ekrane Darbalaukį</string> | 30 | <string name="display_desktop">Rodyti Darbalaukio foną</string> |
1325 | 30 | <string name="display_reset">Atstatyti Ekraną</string> | 31 | <string name="display_list_autoscroll">Leisti slinkti pasirinktą elementą į sąrašo centrą</string> |
1326 | 31 | <string name="display_screen">Rodyti uždengtą Ekraną</string> | 32 | <string name="display_reset">Rodyti Gyvai ekraną</string> |
1327 | 32 | <string name="display_theme">Rodyti ekrane Temos foną</string> | 33 | <string name="display_settings">Ekrano Nustatymas</string> |
1328 | 34 | <string name="display_screen">Rodyti tik Juodą</string> | ||
1329 | 35 | <string name="display_theme">Rodyti tik Temą</string> | ||
1330 | 33 | <string name="enable_custom_timeouts">Įjungti Pasirinktinius Laiko Limitus</string> | 36 | <string name="enable_custom_timeouts">Įjungti Pasirinktinius Laiko Limitus</string> |
1331 | 34 | <string name="enter_alert_text">Įveskite Įspėjimo Tekstą</string> | 37 | <string name="enter_alert_text">Įveskite Įspėjimo Tekstą</string> |
1332 | 38 | <string name="enable_autoscroll">Leisti automatiškai centruoti ekranus</string> | ||
1333 | 35 | <string name="home">Pradžia</string> | 39 | <string name="home">Pradžia</string> |
1334 | 36 | <string name="httpreturn_unauthorised">Neleistina Prieiga, prašome įvesti teisingą vartotojo vardą bei slaptažodį</string> | 40 | <string name="httpreturn_unauthorised">Neleistina Prieiga, prašome įvesti teisingą vartotojo vardą bei slaptažodį</string> |
1335 | 41 | <string name="live_list">Sąrašas Gyvai</string> | ||
1336 | 42 | <string name="live_view">Gyvas Rodinys</string> | ||
1337 | 37 | <string name="navigation_drawer_open">Atidaryti naršymo stalčių</string> | 43 | <string name="navigation_drawer_open">Atidaryti naršymo stalčių</string> |
1338 | 38 | <string name="navigation_drawer_close">Uždaryti naršymo stalčių</string> | 44 | <string name="navigation_drawer_close">Uždaryti naršymo stalčių</string> |
1339 | 45 | <string name="next">Kitas</string> | ||
1340 | 39 | <string name="none">Joks</string> | 46 | <string name="none">Joks</string> |
1341 | 40 | <string name="port">Prievadas</string> | 47 | <string name="port">Prievadas</string> |
1342 | 48 | <string name="previous">Ankstesnis</string> | ||
1343 | 49 | <string name="process">Vykdyti</string> | ||
1344 | 41 | <string name="service_list">Pamaldų Programos Sąrašas</string> | 50 | <string name="service_list">Pamaldų Programos Sąrašas</string> |
1345 | 42 | <string name="stage_view">Scenos Rodinys</string> | 51 | <string name="stage_view">Scenos Rodinys</string> |
1346 | 43 | <string name="text_size_type">Ekrano Teksto Dydis</string> | ||
1347 | 44 | <string name="text_size">Pasirinkite rodomo teksto dydį</string> | 52 | <string name="text_size">Pasirinkite rodomo teksto dydį</string> |
1348 | 45 | <string name="text_size_summary">Keisti Pamaldų programos teksto dydį</string> | 53 | <string name="text_size_summary">Keisti Pamaldų programos teksto dydį</string> |
1349 | 46 | <string name="title_activity_settings">Nustatymus</string> | 54 | <string name="title_activity_settings">Nustatymus</string> |
1350 | 47 | 55 | ||
1351 | === modified file 'app/src/main/res/values-nb/strings.xml' | |||
1352 | --- app/src/main/res/values-nb/strings.xml 2015-05-30 05:53:10 +0000 | |||
1353 | +++ app/src/main/res/values-nb/strings.xml 2015-10-16 19:35:50 +0000 | |||
1354 | @@ -26,25 +26,29 @@ | |||
1355 | 26 | <string name="connection_timeout_summary">Velg en verdi (millisekund)</string> | 26 | <string name="connection_timeout_summary">Velg en verdi (millisekund)</string> |
1356 | 27 | <string name="connection_userid">Brukernavn</string> | 27 | <string name="connection_userid">Brukernavn</string> |
1357 | 28 | <string name="custom_timeout">Angi egendefinert tidsavbrudd</string> | 28 | <string name="custom_timeout">Angi egendefinert tidsavbrudd</string> |
1363 | 29 | <string name="display_blank_summary">Velg ønsket slukk skjerm modus</string> | 29 | <string name="display_blank_summary">Velg ønsket visning</string> |
1364 | 30 | <string name="display_desktop">Sett skjerm til skrivebord</string> | 30 | <string name="display_desktop">Vis skrivebordsbakgrunn</string> |
1365 | 31 | <string name="display_reset">Tilbakestille skjerm</string> | 31 | <string name="display_list_autoscroll">Tillat valgt punkt å rulle til midt på listen</string> |
1366 | 32 | <string name="display_screen">Sett skjermen til sort</string> | 32 | <string name="display_reset">Vis aktivt bilde</string> |
1367 | 33 | <string name="display_theme">Sett skjermen til tema</string> | 33 | <string name="display_settings">Skjerminnstilling</string> |
1368 | 34 | <string name="display_screen">Vis sort skjerm</string> | ||
1369 | 35 | <string name="display_theme">Vis tema</string> | ||
1370 | 34 | <string name="enable_custom_timeouts">Aktiver egendefinerte tidsavbrudd</string> | 36 | <string name="enable_custom_timeouts">Aktiver egendefinerte tidsavbrudd</string> |
1371 | 35 | <string name="enter_alert_text">Skriv meldingstekst</string> | 37 | <string name="enter_alert_text">Skriv meldingstekst</string> |
1372 | 38 | <string name="enable_autoscroll">Tillat automatisk sentrering av skjermene</string> | ||
1373 | 36 | <string name="home">Hjem</string> | 39 | <string name="home">Hjem</string> |
1374 | 37 | <string name="httpreturn_unauthorised">Ikke godkjent tilgang, vennligst skriv gyldig brukernavn og passord</string> | 40 | <string name="httpreturn_unauthorised">Ikke godkjent tilgang, vennligst skriv gyldig brukernavn og passord</string> |
1375 | 38 | <string name="live_list">Framvisningsliste</string> | 41 | <string name="live_list">Framvisningsliste</string> |
1377 | 39 | <string name="live_view">Direktevisning</string> | 42 | <string name="live_view">Skjermvisning</string> |
1378 | 40 | <string name="navigation_drawer_open">Åpne navigasjonsmenyen</string> | 43 | <string name="navigation_drawer_open">Åpne navigasjonsmenyen</string> |
1379 | 41 | <string name="navigation_drawer_close">Lukke navigasjonsmenyen</string> | 44 | <string name="navigation_drawer_close">Lukke navigasjonsmenyen</string> |
1380 | 45 | <string name="next">Neste</string> | ||
1381 | 42 | <string name="none">Ingen</string> | 46 | <string name="none">Ingen</string> |
1382 | 43 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
1383 | 48 | <string name="previous">Forrige</string> | ||
1384 | 44 | <string name="process">Behandle</string> | 49 | <string name="process">Behandle</string> |
1385 | 45 | <string name="service_list">Møteprogramliste</string> | 50 | <string name="service_list">Møteprogramliste</string> |
1386 | 46 | <string name="stage_view">Scenevisning</string> | 51 | <string name="stage_view">Scenevisning</string> |
1387 | 47 | <string name="text_size_type">Tekststørrelse i skjerm</string> | ||
1388 | 48 | <string name="text_size">Velg tekststørrelse i skjerm</string> | 52 | <string name="text_size">Velg tekststørrelse i skjerm</string> |
1389 | 49 | <string name="text_size_summary">Endre tekststørrelsen i møteprogrammet</string> | 53 | <string name="text_size_summary">Endre tekststørrelsen i møteprogrammet</string> |
1390 | 50 | <string name="title_activity_settings">Innstillinger</string> | 54 | <string name="title_activity_settings">Innstillinger</string> |
1391 | 51 | 55 | ||
1392 | === modified file 'app/src/main/res/values-nl/strings.xml' | |||
1393 | --- app/src/main/res/values-nl/strings.xml 2015-05-30 05:53:10 +0000 | |||
1394 | +++ app/src/main/res/values-nl/strings.xml 2015-10-16 19:35:50 +0000 | |||
1395 | @@ -26,22 +26,26 @@ | |||
1396 | 26 | <string name="connection_timeout_summary">Selecteer een waarde (milliseconden)</string> | 26 | <string name="connection_timeout_summary">Selecteer een waarde (milliseconden)</string> |
1397 | 27 | <string name="connection_userid">Gebruikersnaam</string> | 27 | <string name="connection_userid">Gebruikersnaam</string> |
1398 | 28 | <string name="custom_timeout">Aangepaste timeout instellen</string> | 28 | <string name="custom_timeout">Aangepaste timeout instellen</string> |
1403 | 29 | <string name="display_blank_summary">Selecteer verplichte leeg scherm soort </string> | 29 | <string name="display_blank_summary">Selecteer het verplichte scherm</string> |
1404 | 30 | <string name="display_desktop">Scherm leegmaken naar bureaublad</string> | 30 | <string name="display_desktop">Toon Desktop achtergrond</string> |
1405 | 31 | <string name="display_screen">Scherm leegmaken</string> | 31 | <string name="display_reset">Toon live scherm</string> |
1406 | 32 | <string name="display_theme">Scherm leegmaken naar thema</string> | 32 | <string name="display_screen">Toon alleen zwart</string> |
1407 | 33 | <string name="display_theme">Toon alleen thema</string> | ||
1408 | 33 | <string name="enable_custom_timeouts"> Aangepaste timeouts toestaan</string> | 34 | <string name="enable_custom_timeouts"> Aangepaste timeouts toestaan</string> |
1409 | 34 | <string name="enter_alert_text">Voer waarschuwingstekst in</string> | 35 | <string name="enter_alert_text">Voer waarschuwingstekst in</string> |
1410 | 35 | <string name="home">Startpagina</string> | 36 | <string name="home">Startpagina</string> |
1411 | 36 | <string name="httpreturn_unauthorised">Geen toegang, voer juiste gebruikersnaam en wachtwoord in</string> | 37 | <string name="httpreturn_unauthorised">Geen toegang, voer juiste gebruikersnaam en wachtwoord in</string> |
1412 | 37 | <string name="live_list">Live lijst</string> | 38 | <string name="live_list">Live lijst</string> |
1413 | 38 | <string name="live_view">Live weergave</string> | ||
1414 | 39 | <string name="navigation_drawer_open">Open navigatiemenu</string> | 39 | <string name="navigation_drawer_open">Open navigatiemenu</string> |
1415 | 40 | <string name="navigation_drawer_close">Sluit navigatiemenu</string> | 40 | <string name="navigation_drawer_close">Sluit navigatiemenu</string> |
1416 | 41 | <string name="next">Volgende</string> | ||
1417 | 41 | <string name="none">Niet</string> | 42 | <string name="none">Niet</string> |
1418 | 42 | <string name="port">Poort</string> | 43 | <string name="port">Poort</string> |
1419 | 44 | <string name="previous">Vorige</string> | ||
1420 | 45 | <string name="process">Verwerken</string> | ||
1421 | 43 | <string name="service_list">Liturgie lijst</string> | 46 | <string name="service_list">Liturgie lijst</string> |
1422 | 44 | <string name="stage_view">Podiumweergave</string> | 47 | <string name="stage_view">Podiumweergave</string> |
1423 | 48 | <string name="text_size">Selecteer schermtekstgrootte</string> | ||
1424 | 45 | <string name="text_size_summary">Verander lettergrootte liturgie</string> | 49 | <string name="text_size_summary">Verander lettergrootte liturgie</string> |
1425 | 46 | <string name="title_activity_settings">Instellingen</string> | 50 | <string name="title_activity_settings">Instellingen</string> |
1426 | 47 | <string name="url_hint">Hostname of IP adres</string> | 51 | <string name="url_hint">Hostname of IP adres</string> |
1427 | 48 | 52 | ||
1428 | === modified file 'app/src/main/res/values-pl/strings.xml' | |||
1429 | --- app/src/main/res/values-pl/strings.xml 2015-05-30 05:53:10 +0000 | |||
1430 | +++ app/src/main/res/values-pl/strings.xml 2015-10-16 19:35:50 +0000 | |||
1431 | @@ -1,24 +1,51 @@ | |||
1432 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
1433 | 2 | <resources> | 2 | <resources> |
1434 | 3 | <string name="about_display_1">OpenLP jest wolnym programem do obsługi kościelnego projektora</string> | ||
1435 | 4 | <string name="about_display_2">Dowiedz się więcej na stronie OpenLP</string> | ||
1436 | 3 | <string name="about_display_4">Prawa autorskie</string> | 5 | <string name="about_display_4">Prawa autorskie</string> |
1438 | 4 | <string name="about_display_5">Częściowe prawa autorskie</string> | 6 | <string name="about_display_5">Cząstkowe prawa autorskie</string> |
1439 | 5 | <string name="about_display_6">Licencja</string> | 7 | <string name="about_display_6">Licencja</string> |
1440 | 8 | <string name="about_display_7">Ten program jest wolnym oprogramowaniem; możesz go rozprzestrzeniać lub modyfikować zgodnie z zasadami Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania; zgodnie z 2 wersją tej Licencji</string> | ||
1441 | 9 | <string name="about_display_8">Ten program jest rozpowszechniany w nadziei, że będzie pożyteczny, ale BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ</string> | ||
1442 | 6 | <string name="action_settings">Ustawienia</string> | 10 | <string name="action_settings">Ustawienia</string> |
1443 | 7 | <string name="action_about">O programie</string> | 11 | <string name="action_about">O programie</string> |
1444 | 8 | <string name="action_alert">Komunikat</string> | 12 | <string name="action_alert">Komunikat</string> |
1445 | 13 | <string name="action_back">Wróć</string> | ||
1446 | 9 | <string name="action_preferences">Preferencje</string> | 14 | <string name="action_preferences">Preferencje</string> |
1447 | 10 | <string name="action_refresh">Odśwież</string> | 15 | <string name="action_refresh">Odśwież</string> |
1448 | 11 | <string name="action_search">Szukaj</string> | 16 | <string name="action_search">Szukaj</string> |
1449 | 12 | <string name="app_name">OpenLP</string> | 17 | <string name="app_name">OpenLP</string> |
1450 | 13 | <string name="cancel">Anuluj</string> | 18 | <string name="cancel">Anuluj</string> |
1452 | 14 | <string name="connection_timeout">limit czasowy połączenia</string> | 19 | <string name="connection_configuration">Konfiguruj sieć</string> |
1453 | 20 | <string name="connection_password">Hasło</string> | ||
1454 | 21 | <string name="connection_profile">Szczegóły serwera</string> | ||
1455 | 22 | <string name="connection_profile_ssl_use">Używaj HTTPS</string> | ||
1456 | 23 | <string name="connection_profile_ssl_summary">Sprecyzuj czy HTTPS powinno być używane</string> | ||
1457 | 24 | <string name="connection_timeout">Limit czasowy połączenia</string> | ||
1458 | 15 | <string name="connection_timeout_summary">Wybierz wartość (milisekundy)</string> | 25 | <string name="connection_timeout_summary">Wybierz wartość (milisekundy)</string> |
1461 | 16 | <string name="display_blank_summary">Wybierz wymagany pusty typ</string> | 26 | <string name="connection_userid">Nazwa użytkownika</string> |
1462 | 17 | <string name="enable_custom_timeouts">niestandardowe</string> | 27 | <string name="custom_timeout">Ustaw inny limit czasowy</string> |
1463 | 28 | <string name="display_blank_summary">Wybierz wyświetlacz</string> | ||
1464 | 29 | <string name="display_desktop">Wyświetl tło ekranu</string> | ||
1465 | 30 | <string name="display_reset">Pokaż Ekran</string> | ||
1466 | 31 | <string name="display_screen">Wyświetl czarny ekran</string> | ||
1467 | 32 | <string name="display_theme">Wyświetl tylko motyw</string> | ||
1468 | 33 | <string name="enable_custom_timeouts">Niestandardowy limit czasu</string> | ||
1469 | 34 | <string name="enter_alert_text">Wpisz tekst komunikatu</string> | ||
1470 | 18 | <string name="home">Home</string> | 35 | <string name="home">Home</string> |
1472 | 19 | <string name="none">nic</string> | 36 | <string name="httpreturn_unauthorised">Nieuprawniony dostęp, proszę wprowadź nazwę użytkownika oraz hasło.</string> |
1473 | 37 | <string name="live_list">Plan nabożeństwa</string> | ||
1474 | 38 | <string name="live_view">Ekran</string> | ||
1475 | 39 | <string name="next">Następny</string> | ||
1476 | 40 | <string name="none">Nic</string> | ||
1477 | 20 | <string name="port">Port</string> | 41 | <string name="port">Port</string> |
1479 | 21 | <string name="text_size_summary">Zmień rozmiar czcionki wiadomości serwisowych</string> | 42 | <string name="previous">Poprzedni</string> |
1480 | 43 | <string name="process">Wyświetl</string> | ||
1481 | 44 | <string name="service_list">Plan Nabożeństwa</string> | ||
1482 | 45 | <string name="stage_view">Scena</string> | ||
1483 | 46 | <string name="text_size">Wybierz rozmiar wyświetlanego tekstu </string> | ||
1484 | 47 | <string name="text_size_summary">Zmień rozmiar czcionki w Planie Nabożeństwa</string> | ||
1485 | 22 | <string name="title_activity_settings">Ustawienia</string> | 48 | <string name="title_activity_settings">Ustawienia</string> |
1486 | 23 | <string name="url_hint">Nazwa hosta lub IP</string> | 49 | <string name="url_hint">Nazwa hosta lub IP</string> |
1487 | 50 | <string name="unable">Nie można wykonać żądania - sprawdź ustawienia sieciowe</string> | ||
1488 | 24 | </resources> | 51 | </resources> |
1489 | 25 | 52 | ||
1490 | === added directory 'app/src/main/res/values-pt-rBR' | |||
1491 | === added file 'app/src/main/res/values-pt-rBR/strings.xml' | |||
1492 | --- app/src/main/res/values-pt-rBR/strings.xml 1970-01-01 00:00:00 +0000 | |||
1493 | +++ app/src/main/res/values-pt-rBR/strings.xml 2015-10-16 19:35:50 +0000 | |||
1494 | @@ -0,0 +1,52 @@ | |||
1495 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1496 | 2 | <resources> | ||
1497 | 3 | <string name="about_display_1">O OpenLP é um software livre para exibições em igrejas</string> | ||
1498 | 4 | <string name="about_display_2">Para saber mais visite o site do OpenLP</string> | ||
1499 | 5 | <string name="about_display_4">Direitos Autorais</string> | ||
1500 | 6 | <string name="about_display_5">Partes copyright</string> | ||
1501 | 7 | <string name="about_display_6">Licença</string> | ||
1502 | 8 | <string name="about_display_7">Este programa é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como publicada pela Fundação do Software Livre; na versão 2 da Licença.</string> | ||
1503 | 9 | <string name="about_display_8">Este programa é distribuido na esperança que será útil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja abaixo para maiores detalhes.</string> | ||
1504 | 10 | <string name="action_settings">Configurações</string> | ||
1505 | 11 | <string name="action_about">Sobre</string> | ||
1506 | 12 | <string name="action_alert">Alertar</string> | ||
1507 | 13 | <string name="action_back">Voltar</string> | ||
1508 | 14 | <string name="action_blank">Altenar Monitor</string> | ||
1509 | 15 | <string name="action_preferences">Preferências</string> | ||
1510 | 16 | <string name="action_refresh">Atualizar</string> | ||
1511 | 17 | <string name="action_search">Busca</string> | ||
1512 | 18 | <string name="app_name">OpenLP</string> | ||
1513 | 19 | <string name="cancel">Cancelar</string> | ||
1514 | 20 | <string name="connection_configuration">Configurar Rede</string> | ||
1515 | 21 | <string name="connection_password">Senha</string> | ||
1516 | 22 | <string name="connection_profile">Detalhes do Servidor</string> | ||
1517 | 23 | <string name="connection_profile_ssl_use">Usar HTTPS</string> | ||
1518 | 24 | <string name="connection_profile_ssl_summary">Especifique se o HTTPS deve ser usado</string> | ||
1519 | 25 | <string name="connection_timeout">Tempo limite de conexão</string> | ||
1520 | 26 | <string name="connection_timeout_summary">Selecione um valor (em milissegundos)</string> | ||
1521 | 27 | <string name="connection_userid">Usuário</string> | ||
1522 | 28 | <string name="custom_timeout">Ativar Timeout Personalizado</string> | ||
1523 | 29 | <string name="display_blank_summary">Selecione o monitor requerido</string> | ||
1524 | 30 | <string name="display_desktop">Exibir Plano de Fundo da Área de Trabalho</string> | ||
1525 | 31 | <string name="display_reset">Mostrar Visualização Ao Vivo</string> | ||
1526 | 32 | <string name="display_settings">Configurações de Exibição</string> | ||
1527 | 33 | <string name="display_screen">Exibir Tela Preta</string> | ||
1528 | 34 | <string name="display_theme">Exibir Tema</string> | ||
1529 | 35 | <string name="enable_custom_timeouts">Habilitar Timeouts personalizados</string> | ||
1530 | 36 | <string name="enter_alert_text">Digitar Texto de Alerta</string> | ||
1531 | 37 | <string name="home">Home</string> | ||
1532 | 38 | <string name="httpreturn_unauthorised">Acesso não autorizado, por favor, digite usuário e senha válidos</string> | ||
1533 | 39 | <string name="live_list">Lista Ao Vivo</string> | ||
1534 | 40 | <string name="next">Próximo</string> | ||
1535 | 41 | <string name="none">Nenhum</string> | ||
1536 | 42 | <string name="port">Porta</string> | ||
1537 | 43 | <string name="previous">Anterior</string> | ||
1538 | 44 | <string name="process">Processo</string> | ||
1539 | 45 | <string name="service_list">Lista de Serviço</string> | ||
1540 | 46 | <string name="stage_view">Visualização de Palvo</string> | ||
1541 | 47 | <string name="text_size">Selecionar tamanho do monitor de exibição</string> | ||
1542 | 48 | <string name="text_size_summary">Alterar o tamanho do texto de culto</string> | ||
1543 | 49 | <string name="title_activity_settings">Configurações</string> | ||
1544 | 50 | <string name="url_hint">Hostname ou IP</string> | ||
1545 | 51 | <string name="unable">Não é possível processar o pedido - verifique as configurações de rede</string> | ||
1546 | 52 | </resources> | ||
1547 | 0 | 53 | ||
1548 | === removed directory 'app/src/main/res/values-pt_rBR' | |||
1549 | === removed file 'app/src/main/res/values-pt_rBR/strings.xml' | |||
1550 | --- app/src/main/res/values-pt_rBR/strings.xml 2015-05-30 05:53:10 +0000 | |||
1551 | +++ app/src/main/res/values-pt_rBR/strings.xml 1970-01-01 00:00:00 +0000 | |||
1552 | @@ -1,25 +0,0 @@ | |||
1553 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1554 | 2 | <resources> | ||
1555 | 3 | <string name="about_display_4">Direitos Autorais</string> | ||
1556 | 4 | <string name="about_display_5">Partes copyright</string> | ||
1557 | 5 | <string name="about_display_6">Licença</string> | ||
1558 | 6 | <string name="action_settings">Configurações</string> | ||
1559 | 7 | <string name="action_about">Sobre</string> | ||
1560 | 8 | <string name="action_alert">Alertar</string> | ||
1561 | 9 | <string name="action_back">Voltar</string> | ||
1562 | 10 | <string name="action_preferences">Preferências</string> | ||
1563 | 11 | <string name="action_refresh">Atualizar</string> | ||
1564 | 12 | <string name="action_search">Busca</string> | ||
1565 | 13 | <string name="app_name">OpenLP</string> | ||
1566 | 14 | <string name="cancel">Cancelar</string> | ||
1567 | 15 | <string name="connection_timeout">Tempo limite de conexão</string> | ||
1568 | 16 | <string name="connection_timeout_summary">Selecione um valor (em milissegundos)</string> | ||
1569 | 17 | <string name="display_blank_summary">Selecione o \'Tipo em Branco\' requerido</string> | ||
1570 | 18 | <string name="enable_custom_timeouts">Habilitar Timeouts personalizados</string> | ||
1571 | 19 | <string name="home">Home</string> | ||
1572 | 20 | <string name="none">Nenhum</string> | ||
1573 | 21 | <string name="port">Porta</string> | ||
1574 | 22 | <string name="text_size_summary">Alterar o tamanho do texto de culto</string> | ||
1575 | 23 | <string name="title_activity_settings">Configurações</string> | ||
1576 | 24 | <string name="url_hint">Hostname ou IP</string> | ||
1577 | 25 | </resources> | ||
1578 | 26 | 0 | ||
1579 | === modified file 'app/src/main/res/values-ro/strings.xml' | |||
1580 | --- app/src/main/res/values-ro/strings.xml 2015-05-30 05:53:10 +0000 | |||
1581 | +++ app/src/main/res/values-ro/strings.xml 2015-10-16 19:35:50 +0000 | |||
1582 | @@ -1,10 +1,57 @@ | |||
1583 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
1584 | 2 | <resources> | 2 | <resources> |
1585 | 3 | <string name="about_display_1">OpenLP este un program gratuit de prezentare pentru biserică</string> | ||
1586 | 4 | <string name="about_display_2">Pentru a afla mai multe vizitați pagina web OpenLP</string> | ||
1587 | 5 | <string name="about_display_4">Drepturi de autor</string> | ||
1588 | 6 | <string name="about_display_5">Drepturi de autor pentru bucăți</string> | ||
1589 | 7 | <string name="about_display_6">Licența</string> | ||
1590 | 8 | <string name="about_display_7">Acest program este gratuit; puteți să îl redistribuiți și/sau să îl modificați în termenii GNU General Public License cum au fost publicați de Free Software Foundation; versiunea 2 a Liceței</string> | ||
1591 | 9 | <string name="about_display_8">Acest program este distribuit în speranța că va fi folositor, dar FĂRĂ NICI O GARANȚIE; nici măcar a garanției implicite de COMERCIALIZARE sau POTRIVIRE PENTRU UN ANUMIT SCOP</string> | ||
1592 | 3 | <string name="action_settings">Setări</string> | 10 | <string name="action_settings">Setări</string> |
1593 | 11 | <string name="action_about">Despre</string> | ||
1594 | 4 | <string name="action_alert">Anunț</string> | 12 | <string name="action_alert">Anunț</string> |
1595 | 13 | <string name="action_back">Înapoi</string> | ||
1596 | 14 | <string name="action_blank">Schimbă Ecranul</string> | ||
1597 | 5 | <string name="action_preferences">Preferințe</string> | 15 | <string name="action_preferences">Preferințe</string> |
1598 | 16 | <string name="action_refresh">Reîncărcare</string> | ||
1599 | 17 | <string name="action_search">Căutare</string> | ||
1600 | 6 | <string name="app_name">OpenLP</string> | 18 | <string name="app_name">OpenLP</string> |
1601 | 19 | <string name="cancel">Anulare</string> | ||
1602 | 20 | <string name="connection_configuration">Configurează Rețeaua</string> | ||
1603 | 21 | <string name="connection_password">Parola</string> | ||
1604 | 22 | <string name="connection_profile">Detalii Server</string> | ||
1605 | 23 | <string name="connection_profile_ssl_use">Folosește HTTPS</string> | ||
1606 | 24 | <string name="connection_profile_ssl_summary">Specificați dacă ar trebui folosit HTTPS</string> | ||
1607 | 25 | <string name="connection_timeout">Conexiunea a expirat</string> | ||
1608 | 26 | <string name="connection_timeout_summary">Selectați o valoare (milisecunde)</string> | ||
1609 | 27 | <string name="connection_userid">Nume utilizator</string> | ||
1610 | 28 | <string name="custom_timeout">Stabiliți timp personalizat de expirare</string> | ||
1611 | 29 | <string name="display_blank_summary">Selectați ecranul necesar</string> | ||
1612 | 30 | <string name="display_desktop">Afișați fundalul spațiului de lucru</string> | ||
1613 | 31 | <string name="display_list_autoscroll">Permite elementului selectat să se deplaseze în mijlocul listei</string> | ||
1614 | 32 | <string name="display_reset">Afișați ecranul \"În direct\"</string> | ||
1615 | 33 | <string name="display_settings">Setare de Afișare</string> | ||
1616 | 34 | <string name="display_screen">Afișați numai negru</string> | ||
1617 | 35 | <string name="display_theme">Afișați numai tema</string> | ||
1618 | 36 | <string name="enable_custom_timeouts">Activează timp de expirare personalizat</string> | ||
1619 | 37 | <string name="enter_alert_text">Introduceți textul Anunțului</string> | ||
1620 | 38 | <string name="enable_autoscroll">Permite ecranelor să se auto-centreze</string> | ||
1621 | 39 | <string name="home">Acasă</string> | ||
1622 | 40 | <string name="httpreturn_unauthorised">Acces neautorizat, vă rog introduceți numele de utilizator și parola corecte.</string> | ||
1623 | 41 | <string name="live_list">Lista În direct</string> | ||
1624 | 42 | <string name="live_view">Vizualizare În direct</string> | ||
1625 | 43 | <string name="navigation_drawer_open">Deschide bara de navigare</string> | ||
1626 | 44 | <string name="navigation_drawer_close">Închide bara de navigare</string> | ||
1627 | 45 | <string name="next">Următor</string> | ||
1628 | 46 | <string name="none">nimic</string> | ||
1629 | 7 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
1630 | 48 | <string name="previous">Anterior</string> | ||
1631 | 49 | <string name="process">Proces</string> | ||
1632 | 50 | <string name="service_list">Lista de Serviciu</string> | ||
1633 | 51 | <string name="stage_view">Vizualizare pentru Scenă</string> | ||
1634 | 52 | <string name="text_size">Selectați mărimea textului afișat</string> | ||
1635 | 53 | <string name="text_size_summary">Schimbați mărimea textului Serviciului</string> | ||
1636 | 8 | <string name="title_activity_settings">Setări</string> | 54 | <string name="title_activity_settings">Setări</string> |
1637 | 9 | <string name="url_hint">Hostname sau IP</string> | 55 | <string name="url_hint">Hostname sau IP</string> |
1638 | 56 | <string name="unable">Nu se poate procesa cererea - verificați setările de rețea</string> | ||
1639 | 10 | </resources> | 57 | </resources> |
1640 | 11 | 58 | ||
1641 | === modified file 'app/src/main/res/values-ru/strings.xml' | |||
1642 | --- app/src/main/res/values-ru/strings.xml 2015-05-30 05:53:10 +0000 | |||
1643 | +++ app/src/main/res/values-ru/strings.xml 2015-10-16 19:35:50 +0000 | |||
1644 | @@ -38,7 +38,7 @@ | |||
1645 | 38 | <string name="process">Выполнение</string> | 38 | <string name="process">Выполнение</string> |
1646 | 39 | <string name="service_list">Список служения</string> | 39 | <string name="service_list">Список служения</string> |
1647 | 40 | <string name="stage_view">Вид сцены</string> | 40 | <string name="stage_view">Вид сцены</string> |
1649 | 41 | <string name="text_size_type">Отображаемые размер текста</string> | 41 | |
1650 | 42 | <string name="text_size">Выберите размер текста</string> | 42 | <string name="text_size">Выберите размер текста</string> |
1651 | 43 | <string name="text_size_summary">Изменить размер текста Служения</string> | 43 | <string name="text_size_summary">Изменить размер текста Служения</string> |
1652 | 44 | <string name="title_activity_settings">Параметры</string> | 44 | <string name="title_activity_settings">Параметры</string> |
1653 | 45 | 45 | ||
1654 | === modified file 'app/src/main/res/values-sk/strings.xml' | |||
1655 | --- app/src/main/res/values-sk/strings.xml 2015-05-30 05:53:10 +0000 | |||
1656 | +++ app/src/main/res/values-sk/strings.xml 2015-10-16 19:35:50 +0000 | |||
1657 | @@ -26,28 +26,32 @@ | |||
1658 | 26 | <string name="connection_timeout_summary">Vybrať hodnotu (milisekundy)</string> | 26 | <string name="connection_timeout_summary">Vybrať hodnotu (milisekundy)</string> |
1659 | 27 | <string name="connection_userid">Používateľské meno</string> | 27 | <string name="connection_userid">Používateľské meno</string> |
1660 | 28 | <string name="custom_timeout">Nastaviť užívateľský časový limiť</string> | 28 | <string name="custom_timeout">Nastaviť užívateľský časový limiť</string> |
1666 | 29 | <string name="display_blank_summary">Vybrať požadovaný prázdny typ</string> | 29 | <string name="display_blank_summary">Vybrať požadované zobrazenie</string> |
1667 | 30 | <string name="display_desktop">Prázdne zobrazenie na plochu</string> | 30 | <string name="display_desktop">Zobraziť pozadie plochy</string> |
1668 | 31 | <string name="display_reset">Obnov zobrazenie</string> | 31 | <string name="display_list_autoscroll">Povoliť vybratej položke rolovať na stred zoznamu</string> |
1669 | 32 | <string name="display_screen">Prázdne zobrazenie na prázdne</string> | 32 | <string name="display_reset">Zobraziť naživo</string> |
1670 | 33 | <string name="display_theme">Prázdne zobrazenie na tému</string> | 33 | <string name="display_settings">Nastavenie zobrazenia</string> |
1671 | 34 | <string name="display_screen">Zobraziť len čiernu</string> | ||
1672 | 35 | <string name="display_theme">Zobraziť len motív</string> | ||
1673 | 34 | <string name="enable_custom_timeouts">Zapnúť užívateľský časový limit</string> | 36 | <string name="enable_custom_timeouts">Zapnúť užívateľský časový limit</string> |
1674 | 35 | <string name="enter_alert_text">Zadať text upozornenia</string> | 37 | <string name="enter_alert_text">Zadať text upozornenia</string> |
1675 | 38 | <string name="enable_autoscroll">Povoliť automatické centrovanie obrazovky</string> | ||
1676 | 36 | <string name="home">Domov</string> | 39 | <string name="home">Domov</string> |
1677 | 37 | <string name="httpreturn_unauthorised">Nepovolený prístup, prosím zadajte správne používateľské meno a heslo</string> | 40 | <string name="httpreturn_unauthorised">Nepovolený prístup, prosím zadajte správne používateľské meno a heslo</string> |
1678 | 38 | <string name="live_list">Zoznam naživo</string> | 41 | <string name="live_list">Zoznam naživo</string> |
1679 | 39 | <string name="live_view">Zobrazenie naživo</string> | 42 | <string name="live_view">Zobrazenie naživo</string> |
1680 | 40 | <string name="navigation_drawer_open">Otvoriť navigačný panel</string> | 43 | <string name="navigation_drawer_open">Otvoriť navigačný panel</string> |
1681 | 41 | <string name="navigation_drawer_close">Zatvoriť navigačný panel</string> | 44 | <string name="navigation_drawer_close">Zatvoriť navigačný panel</string> |
1682 | 45 | <string name="next">Nasledujúci</string> | ||
1683 | 42 | <string name="none">Žiadny</string> | 46 | <string name="none">Žiadny</string> |
1684 | 43 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
1685 | 48 | <string name="previous">Predchádzajúci</string> | ||
1686 | 44 | <string name="process">Spracovať</string> | 49 | <string name="process">Spracovať</string> |
1687 | 45 | <string name="service_list">Správca Služby</string> | 50 | <string name="service_list">Správca Služby</string> |
1688 | 46 | <string name="stage_view">Pódiové zobrazenie</string> | 51 | <string name="stage_view">Pódiové zobrazenie</string> |
1689 | 47 | <string name="text_size_type">Veľkosť zobrazeného textu</string> | ||
1690 | 48 | <string name="text_size">Vybrať veľkosť zobrazeného textu</string> | 52 | <string name="text_size">Vybrať veľkosť zobrazeného textu</string> |
1691 | 49 | <string name="text_size_summary">Zmeniť veľkosť textu služby</string> | 53 | <string name="text_size_summary">Zmeniť veľkosť textu služby</string> |
1692 | 50 | <string name="title_activity_settings">Nastavenia</string> | 54 | <string name="title_activity_settings">Nastavenia</string> |
1694 | 51 | <string name="url_hint">Hostname alebo IP</string> | 55 | <string name="url_hint">Názov počítača alebo IP</string> |
1695 | 52 | <string name="unable">Nie je možné vykonať požiadavku - skontrolujte nastavenie siete</string> | 56 | <string name="unable">Nie je možné vykonať požiadavku - skontrolujte nastavenie siete</string> |
1696 | 53 | </resources> | 57 | </resources> |
1697 | 54 | 58 | ||
1698 | === modified file 'app/src/main/res/values-sv/strings.xml' | |||
1699 | --- app/src/main/res/values-sv/strings.xml 2015-05-30 05:53:10 +0000 | |||
1700 | +++ app/src/main/res/values-sv/strings.xml 2015-10-16 19:35:50 +0000 | |||
1701 | @@ -24,24 +24,31 @@ | |||
1702 | 24 | <string name="connection_profile_ssl_summary">Ange om HTTPS ska användas</string> | 24 | <string name="connection_profile_ssl_summary">Ange om HTTPS ska användas</string> |
1703 | 25 | <string name="connection_timeout">Anslutningstimeout</string> | 25 | <string name="connection_timeout">Anslutningstimeout</string> |
1704 | 26 | <string name="connection_timeout_summary">Välj ett värde (millisekunder)</string> | 26 | <string name="connection_timeout_summary">Välj ett värde (millisekunder)</string> |
1705 | 27 | <string name="connection_userid">Användarnamn</string> | ||
1706 | 27 | <string name="custom_timeout">Ställ in egen timeout</string> | 28 | <string name="custom_timeout">Ställ in egen timeout</string> |
1712 | 28 | <string name="display_blank_summary">Välj metod för att släcka skärmen</string> | 29 | <string name="display_blank_summary">Välj bildläge</string> |
1713 | 29 | <string name="display_desktop">Visa skrivbord</string> | 30 | <string name="display_desktop">Visa skrivbordsbakgrund</string> |
1714 | 30 | <string name="display_reset">Återställ skärm</string> | 31 | <string name="display_list_autoscroll">Tillåt den valda posten att automatiskt scrolla till mitten på listan</string> |
1715 | 31 | <string name="display_screen">Släck skärm</string> | 32 | <string name="display_reset">Visa live-bild</string> |
1716 | 32 | <string name="display_theme">Släck till tema</string> | 33 | <string name="display_settings">Bildinställningar</string> |
1717 | 34 | <string name="display_screen">Visa endast svart skärm</string> | ||
1718 | 35 | <string name="display_theme">Visa endast tema</string> | ||
1719 | 33 | <string name="enable_custom_timeouts">Aktivera egna timeouter</string> | 36 | <string name="enable_custom_timeouts">Aktivera egna timeouter</string> |
1720 | 34 | <string name="enter_alert_text">Ange meddelandetext</string> | 37 | <string name="enter_alert_text">Ange meddelandetext</string> |
1721 | 38 | <string name="enable_autoscroll">Tillåt skärmar att centrera automatiskt</string> | ||
1722 | 35 | <string name="home">Hem</string> | 39 | <string name="home">Hem</string> |
1723 | 40 | <string name="httpreturn_unauthorised">Anslutning nekad, kontrollera användarnamn och lösenord</string> | ||
1724 | 36 | <string name="live_list">Live-lista</string> | 41 | <string name="live_list">Live-lista</string> |
1725 | 37 | <string name="live_view">Live-bild</string> | 42 | <string name="live_view">Live-bild</string> |
1726 | 38 | <string name="navigation_drawer_open">Öppna navigeringsmeny</string> | 43 | <string name="navigation_drawer_open">Öppna navigeringsmeny</string> |
1727 | 39 | <string name="navigation_drawer_close">Stäng navigeringsmeny</string> | 44 | <string name="navigation_drawer_close">Stäng navigeringsmeny</string> |
1728 | 45 | <string name="next">Nästa</string> | ||
1729 | 40 | <string name="none">Inga</string> | 46 | <string name="none">Inga</string> |
1730 | 41 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
1731 | 48 | <string name="previous">Föregående</string> | ||
1732 | 49 | <string name="process">Visa</string> | ||
1733 | 42 | <string name="service_list">Körschema</string> | 50 | <string name="service_list">Körschema</string> |
1734 | 43 | <string name="stage_view">Scenbild</string> | 51 | <string name="stage_view">Scenbild</string> |
1735 | 44 | <string name="text_size_type">Bildens textstorlek</string> | ||
1736 | 45 | <string name="text_size">Välj bildens textstorlek</string> | 52 | <string name="text_size">Välj bildens textstorlek</string> |
1737 | 46 | <string name="text_size_summary">Ändra körschemats textstorlek</string> | 53 | <string name="text_size_summary">Ändra körschemats textstorlek</string> |
1738 | 47 | <string name="title_activity_settings">Inställningar</string> | 54 | <string name="title_activity_settings">Inställningar</string> |
1739 | 48 | 55 | ||
1740 | === removed directory 'app/src/main/res/values-ta_rLK' | |||
1741 | === removed file 'app/src/main/res/values-ta_rLK/strings.xml' | |||
1742 | --- app/src/main/res/values-ta_rLK/strings.xml 2015-05-30 05:53:10 +0000 | |||
1743 | +++ app/src/main/res/values-ta_rLK/strings.xml 1970-01-01 00:00:00 +0000 | |||
1744 | @@ -1,24 +0,0 @@ | |||
1745 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1746 | 2 | <resources> | ||
1747 | 3 | <string name="about_display_4">பதிப்புரிமை</string> | ||
1748 | 4 | <string name="about_display_5">பகுதிகள் பதிப்புரிமை</string> | ||
1749 | 5 | <string name="about_display_6">உரிமம்</string> | ||
1750 | 6 | <string name="action_settings">அமைப்புகள்</string> | ||
1751 | 7 | <string name="action_about">பற்றி</string> | ||
1752 | 8 | <string name="action_alert">எச்சரிக்கை செய</string> | ||
1753 | 9 | <string name="action_preferences">விருப்பங்கள</string> | ||
1754 | 10 | <string name="action_refresh">புதுப்பி</string> | ||
1755 | 11 | <string name="action_search">தேடல்</string> | ||
1756 | 12 | <string name="app_name">OpenLp</string> | ||
1757 | 13 | <string name="cancel">ரத்து</string> | ||
1758 | 14 | <string name="connection_timeout">இணைப்பு காலம் கடந்தது</string> | ||
1759 | 15 | <string name="connection_timeout_summary">ஒரு மதிப்பு (மில்லிவினாடிகள்) தேர்ந்தெடுக்கவும்</string> | ||
1760 | 16 | <string name="display_blank_summary">தேவையான காலி வகை தேர்ந்தெடுக்கவும்</string> | ||
1761 | 17 | <string name="enable_custom_timeouts">தனிபயன் நேரம் செயல்படுத்த</string> | ||
1762 | 18 | <string name="home">வீட்டு</string> | ||
1763 | 19 | <string name="none">ஒன்றுமில்லை</string> | ||
1764 | 20 | <string name="port">துறைமுகம்</string> | ||
1765 | 21 | <string name="text_size_summary">சேவையை உரை அளவை மாற்ற</string> | ||
1766 | 22 | <string name="title_activity_settings">அமைப்புகள்</string> | ||
1767 | 23 | <string name="url_hint">புரவலன் பெயர் அல்லது IP</string> | ||
1768 | 24 | </resources> | ||
1769 | 25 | 0 | ||
1770 | === removed directory 'app/src/main/res/values-th_rTH' | |||
1771 | === removed file 'app/src/main/res/values-th_rTH/strings.xml' | |||
1772 | --- app/src/main/res/values-th_rTH/strings.xml 2015-05-30 05:53:10 +0000 | |||
1773 | +++ app/src/main/res/values-th_rTH/strings.xml 1970-01-01 00:00:00 +0000 | |||
1774 | @@ -1,24 +0,0 @@ | |||
1775 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1776 | 2 | <resources> | ||
1777 | 3 | <string name="about_display_4">สงวนลิขสิทธิ์</string> | ||
1778 | 4 | <string name="about_display_5">สงวนลิขสิทธิ์บางส่วน</string> | ||
1779 | 5 | <string name="about_display_6">สัญญาอนุญาต</string> | ||
1780 | 6 | <string name="action_settings">ตั้งค่า</string> | ||
1781 | 7 | <string name="action_about">เกี่ยวกับ</string> | ||
1782 | 8 | <string name="action_alert">แจ้งเตือน</string> | ||
1783 | 9 | <string name="action_preferences">การตั้งค่า</string> | ||
1784 | 10 | <string name="action_refresh">การฟื้นฟู</string> | ||
1785 | 11 | <string name="action_search">ค้นหา</string> | ||
1786 | 12 | <string name="app_name">OpenLP</string> | ||
1787 | 13 | <string name="cancel">ยกเลิก</string> | ||
1788 | 14 | <string name="connection_timeout">หมดเวลาการเชื่อมต่อ</string> | ||
1789 | 15 | <string name="connection_timeout_summary">เลือกค่า (มิลลิวินาที)</string> | ||
1790 | 16 | <string name="display_blank_summary">เลือกรูปแบบของประเภทที่ว่างเปล่า</string> | ||
1791 | 17 | <string name="enable_custom_timeouts">เปิดใช้งานหมดเวลาที่กำหนดเอง</string> | ||
1792 | 18 | <string name="home">หน้าหลัก</string> | ||
1793 | 19 | <string name="none">ไม่มี</string> | ||
1794 | 20 | <string name="port">Port</string> | ||
1795 | 21 | <string name="text_size_summary">เปลี่ยนขนาดตัวอักษรบริการ</string> | ||
1796 | 22 | <string name="title_activity_settings">ตั้งค่า</string> | ||
1797 | 23 | <string name="url_hint">Hostname หรือ IP</string> | ||
1798 | 24 | </resources> | ||
1799 | 25 | 0 | ||
1800 | === modified file 'app/src/main/res/values-uk/strings.xml' | |||
1801 | --- app/src/main/res/values-uk/strings.xml 2015-05-30 05:53:10 +0000 | |||
1802 | +++ app/src/main/res/values-uk/strings.xml 2015-10-16 19:35:50 +0000 | |||
1803 | @@ -1,4 +1,51 @@ | |||
1804 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
1805 | 2 | <resources> | 2 | <resources> |
1806 | 3 | <string name="about_display_1">OpenLP це безкоштовна програма для презентацій в церкві</string> | ||
1807 | 4 | <string name="about_display_2">Щоб дізнатися більше, відвідайте веб-сайт OpenLP</string> | ||
1808 | 5 | <string name="about_display_4">Авторське право:</string> | ||
1809 | 6 | <string name="about_display_5">Часткове авторське право</string> | ||
1810 | 7 | <string name="about_display_6">Ліцензія</string> | ||
1811 | 8 | <string name="about_display_7">Ця програма є вільним програмним забезпеченням; ви можете розповсюджувати та/або змінювати його відповідно до умов GNU General Public License, виданої Фондом вільного програмного забезпечення, версія 2 Ліцензії</string> | ||
1812 | 9 | <string name="about_display_8">Ця програма поширюється в надії, що вона буде корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; навіть без гарантій КОМЕРЦІЙНОЇ ЦІННОСТІ чи ПРИДАТНОСТІ ДЛЯ КОНКРЕТНИХ ЦІЛЕЙ</string> | ||
1813 | 10 | <string name="action_settings">Налаштування</string> | ||
1814 | 11 | <string name="action_about">Про</string> | ||
1815 | 3 | <string name="action_alert">Сповіщення</string> | 12 | <string name="action_alert">Сповіщення</string> |
1816 | 13 | <string name="action_back">Назад</string> | ||
1817 | 14 | <string name="action_blank">Переключити Дисплей</string> | ||
1818 | 15 | <string name="action_preferences">Уподобання</string> | ||
1819 | 16 | <string name="action_refresh">Оновити</string> | ||
1820 | 17 | <string name="action_search">Пошук</string> | ||
1821 | 18 | <string name="app_name">OpenLP</string> | ||
1822 | 19 | <string name="cancel">Скасувати</string> | ||
1823 | 20 | <string name="connection_configuration">Налаштування Мережі</string> | ||
1824 | 21 | <string name="connection_password">Пароль</string> | ||
1825 | 22 | <string name="connection_profile">Деталі Сервера</string> | ||
1826 | 23 | <string name="connection_profile_ssl_use">Використовувати HTTPS</string> | ||
1827 | 24 | <string name="connection_profile_ssl_summary">Вкажіть, чи варто використовувати протокол HTTPS</string> | ||
1828 | 25 | <string name="connection_timeout">Час очікування з\'єднання</string> | ||
1829 | 26 | <string name="connection_timeout_summary">Виберіть значення (в мілісекундах)</string> | ||
1830 | 27 | <string name="connection_userid">Ім\'я користувача:</string> | ||
1831 | 28 | <string name="custom_timeout">Втановити інший Час Очікування</string> | ||
1832 | 29 | <string name="display_blank_summary">Виберіть потрібний дисплей</string> | ||
1833 | 30 | <string name="display_desktop">Обрати фон для робочого столу дисплея</string> | ||
1834 | 31 | <string name="display_reset">Показати основний дисплей</string> | ||
1835 | 32 | <string name="display_screen">Тільки Чорний дисплей</string> | ||
1836 | 33 | <string name="display_theme">Тільки Тема дисплею</string> | ||
1837 | 34 | <string name="enable_custom_timeouts">Обрати інший Час Очікування</string> | ||
1838 | 35 | <string name="enter_alert_text">Введіть Текст Сповіщення</string> | ||
1839 | 36 | <string name="home">Дім</string> | ||
1840 | 37 | <string name="httpreturn_unauthorised">Несанкціонований доступ будь ласка, введіть правильне ім\'я користувача та пароль</string> | ||
1841 | 38 | <string name="live_list">Список Перегляду</string> | ||
1842 | 39 | <string name="navigation_drawer_open">Відкрити вікно навігації</string> | ||
1843 | 40 | <string name="navigation_drawer_close">Закрити вікно навігації</string> | ||
1844 | 41 | <string name="none">Ні</string> | ||
1845 | 42 | <string name="port">Порт</string> | ||
1846 | 43 | <string name="process">Процес</string> | ||
1847 | 44 | <string name="service_list">Список Служб</string> | ||
1848 | 45 | <string name="stage_view">Поставити Прегляд</string> | ||
1849 | 46 | <string name="text_size">Виберіть розмір тексту для дисплею</string> | ||
1850 | 47 | <string name="text_size_summary">Змінити розмір шрифту для служби</string> | ||
1851 | 48 | <string name="title_activity_settings">Налаштування</string> | ||
1852 | 49 | <string name="url_hint">Ім\'я хосту або IP</string> | ||
1853 | 50 | <string name="unable">Не вдається обробити запит - перевірте налаштування мережі</string> | ||
1854 | 4 | </resources> | 51 | </resources> |
1855 | 5 | 52 | ||
1856 | === removed directory 'app/src/main/res/values-vi_rVN' | |||
1857 | === removed file 'app/src/main/res/values-vi_rVN/strings.xml' | |||
1858 | --- app/src/main/res/values-vi_rVN/strings.xml 2015-05-30 05:53:10 +0000 | |||
1859 | +++ app/src/main/res/values-vi_rVN/strings.xml 1970-01-01 00:00:00 +0000 | |||
1860 | @@ -1,2 +0,0 @@ | |||
1861 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1862 | 2 | <resources/> | ||
1863 | 3 | 0 | ||
1864 | === added directory 'app/src/main/res/values-zh-rTW' | |||
1865 | === added file 'app/src/main/res/values-zh-rTW/strings.xml' | |||
1866 | --- app/src/main/res/values-zh-rTW/strings.xml 1970-01-01 00:00:00 +0000 | |||
1867 | +++ app/src/main/res/values-zh-rTW/strings.xml 2015-10-16 19:35:50 +0000 | |||
1868 | @@ -0,0 +1,57 @@ | |||
1869 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1870 | 2 | <resources> | ||
1871 | 3 | <string name="about_display_1">OpenLP是免費的教會簡報軟體</string> | ||
1872 | 4 | <string name="about_display_2">要了解詳情,請參閱 OpenLP 網站</string> | ||
1873 | 5 | <string name="about_display_4">版權</string> | ||
1874 | 6 | <string name="about_display_5">程序版權</string> | ||
1875 | 7 | <string name="about_display_6">許可協議</string> | ||
1876 | 8 | <string name="about_display_7">這個程序是自由軟體,你可以遵照自由軟體基金會出版的 GNU通用公共許可證條款第2版來修改和重新發佈這個軟體</string> | ||
1877 | 9 | <string name="about_display_8">這個程式是在期望它是可行的情況下發布, 但是沒有任何擔保,甚至沒有暗示的適用性或針對於特定用途的保障。</string> | ||
1878 | 10 | <string name="action_settings">設定</string> | ||
1879 | 11 | <string name="action_about">關於</string> | ||
1880 | 12 | <string name="action_alert">警告</string> | ||
1881 | 13 | <string name="action_back">退後</string> | ||
1882 | 14 | <string name="action_blank">切換顯示</string> | ||
1883 | 15 | <string name="action_preferences">偏好設定</string> | ||
1884 | 16 | <string name="action_refresh">重新整理</string> | ||
1885 | 17 | <string name="action_search">搜尋</string> | ||
1886 | 18 | <string name="app_name">OpenLP</string> | ||
1887 | 19 | <string name="cancel">取消</string> | ||
1888 | 20 | <string name="connection_configuration">設定網路</string> | ||
1889 | 21 | <string name="connection_password">密碼</string> | ||
1890 | 22 | <string name="connection_profile">聚會細節</string> | ||
1891 | 23 | <string name="connection_profile_ssl_use">使用 HTTPS</string> | ||
1892 | 24 | <string name="connection_profile_ssl_summary">指定是否應使用HTTPS</string> | ||
1893 | 25 | <string name="connection_timeout">連接逾時</string> | ||
1894 | 26 | <string name="connection_timeout_summary">選擇數值(毫秒)</string> | ||
1895 | 27 | <string name="connection_userid">帳號</string> | ||
1896 | 28 | <string name="custom_timeout">自訂逾時</string> | ||
1897 | 29 | <string name="display_blank_summary">選擇需要的顯示畫面</string> | ||
1898 | 30 | <string name="display_desktop">顯示桌面背景</string> | ||
1899 | 31 | <string name="display_list_autoscroll">允許所選擇的項目捲動到清單的中間</string> | ||
1900 | 32 | <string name="display_reset">顯示現場Live</string> | ||
1901 | 33 | <string name="display_settings">顯示設定</string> | ||
1902 | 34 | <string name="display_screen">僅顯示黑幕</string> | ||
1903 | 35 | <string name="display_theme">僅顯示主題</string> | ||
1904 | 36 | <string name="enable_custom_timeouts">開啟自訂逾時</string> | ||
1905 | 37 | <string name="enter_alert_text">輸入警報文字</string> | ||
1906 | 38 | <string name="enable_autoscroll">允許自動置中顯示</string> | ||
1907 | 39 | <string name="home">首頁</string> | ||
1908 | 40 | <string name="httpreturn_unauthorised">未經授權的連結,請輸入有效的帳號和密碼</string> | ||
1909 | 41 | <string name="live_list">現場Live清單</string> | ||
1910 | 42 | <string name="live_view">Live 顯示</string> | ||
1911 | 43 | <string name="navigation_drawer_open">打開隱藏式側選單</string> | ||
1912 | 44 | <string name="navigation_drawer_close">關閉隱藏式側選單</string> | ||
1913 | 45 | <string name="next">下一個</string> | ||
1914 | 46 | <string name="none">無</string> | ||
1915 | 47 | <string name="port">連接埠</string> | ||
1916 | 48 | <string name="previous">前一個</string> | ||
1917 | 49 | <string name="process">程序</string> | ||
1918 | 50 | <string name="service_list">聚會清單</string> | ||
1919 | 51 | <string name="stage_view">舞台查看</string> | ||
1920 | 52 | <string name="text_size">選擇顯示字體尺存</string> | ||
1921 | 53 | <string name="text_size_summary">更改聚會文字大小</string> | ||
1922 | 54 | <string name="title_activity_settings">設定</string> | ||
1923 | 55 | <string name="url_hint">主機名或IP</string> | ||
1924 | 56 | <string name="unable">無法處理請求 - 請檢查網路設定</string> | ||
1925 | 57 | </resources> | ||
1926 | 0 | 58 | ||
1927 | === removed directory 'app/src/main/res/values-zh_rCN' | |||
1928 | === removed file 'app/src/main/res/values-zh_rCN/strings.xml' | |||
1929 | --- app/src/main/res/values-zh_rCN/strings.xml 2015-05-30 05:53:10 +0000 | |||
1930 | +++ app/src/main/res/values-zh_rCN/strings.xml 1970-01-01 00:00:00 +0000 | |||
1931 | @@ -1,24 +0,0 @@ | |||
1932 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1933 | 2 | <resources> | ||
1934 | 3 | <string name="about_display_4">版权</string> | ||
1935 | 4 | <string name="about_display_5">部分版权</string> | ||
1936 | 5 | <string name="about_display_6">许可</string> | ||
1937 | 6 | <string name="action_settings">设定</string> | ||
1938 | 7 | <string name="action_about">关于</string> | ||
1939 | 8 | <string name="action_alert">警告</string> | ||
1940 | 9 | <string name="action_preferences">偏好</string> | ||
1941 | 10 | <string name="action_refresh">刷新</string> | ||
1942 | 11 | <string name="action_search">搜索</string> | ||
1943 | 12 | <string name="app_name">OpenLP</string> | ||
1944 | 13 | <string name="cancel">取消</string> | ||
1945 | 14 | <string name="connection_timeout">连接超时</string> | ||
1946 | 15 | <string name="connection_timeout_summary">选择一个值(毫秒)</string> | ||
1947 | 16 | <string name="display_blank_summary">选择所需的空白类型</string> | ||
1948 | 17 | <string name="enable_custom_timeouts">启用自定义超时</string> | ||
1949 | 18 | <string name="home">主页</string> | ||
1950 | 19 | <string name="none">无</string> | ||
1951 | 20 | <string name="port">端口</string> | ||
1952 | 21 | <string name="text_size_summary">改变敬拜仪式文字大小</string> | ||
1953 | 22 | <string name="title_activity_settings">设定</string> | ||
1954 | 23 | <string name="url_hint">主机名或IP</string> | ||
1955 | 24 | </resources> | ||
1956 | 25 | 0 | ||
1957 | === removed directory 'app/src/main/res/values-zh_rTW' | |||
1958 | === removed file 'app/src/main/res/values-zh_rTW/strings.xml' | |||
1959 | --- app/src/main/res/values-zh_rTW/strings.xml 2015-05-30 05:53:10 +0000 | |||
1960 | +++ app/src/main/res/values-zh_rTW/strings.xml 1970-01-01 00:00:00 +0000 | |||
1961 | @@ -1,53 +0,0 @@ | |||
1962 | 1 | <?xml version='1.0' encoding='UTF-8'?> | ||
1963 | 2 | <resources> | ||
1964 | 3 | <string name="about_display_1">OpenLP是免費的教會簡報軟體</string> | ||
1965 | 4 | <string name="about_display_2">要了解詳情,請參閱 OpenLP 網站</string> | ||
1966 | 5 | <string name="about_display_4">版權</string> | ||
1967 | 6 | <string name="about_display_5">程序版權</string> | ||
1968 | 7 | <string name="about_display_6">許可協議</string> | ||
1969 | 8 | <string name="about_display_7">這個程序是自由軟體,你可以遵照自由軟體基金會出版的 GNU通用公共許可證條款第2版來修改和重新發佈這個軟體</string> | ||
1970 | 9 | <string name="about_display_8">這個程式是在期望它是可行的情況下發布, 但是沒有任何擔保,甚至沒有暗示的適用性或針對於特定用途的保障。</string> | ||
1971 | 10 | <string name="action_settings">設定</string> | ||
1972 | 11 | <string name="action_about">關於</string> | ||
1973 | 12 | <string name="action_alert">警告</string> | ||
1974 | 13 | <string name="action_back">退後</string> | ||
1975 | 14 | <string name="action_blank">切換顯示</string> | ||
1976 | 15 | <string name="action_preferences">偏好設定</string> | ||
1977 | 16 | <string name="action_refresh">重新整理</string> | ||
1978 | 17 | <string name="action_search">搜尋</string> | ||
1979 | 18 | <string name="app_name">OpenLP</string> | ||
1980 | 19 | <string name="cancel">取消</string> | ||
1981 | 20 | <string name="connection_configuration">設定網路</string> | ||
1982 | 21 | <string name="connection_password">密碼</string> | ||
1983 | 22 | <string name="connection_profile">聚會細節</string> | ||
1984 | 23 | <string name="connection_profile_ssl_use">使用 HTTPS</string> | ||
1985 | 24 | <string name="connection_profile_ssl_summary">指定是否應使用HTTPS</string> | ||
1986 | 25 | <string name="connection_timeout">連接逾時</string> | ||
1987 | 26 | <string name="connection_timeout_summary">選擇數值(毫秒)</string> | ||
1988 | 27 | <string name="connection_userid">帳號</string> | ||
1989 | 28 | <string name="custom_timeout">自訂逾時</string> | ||
1990 | 29 | <string name="display_blank_summary">選擇所需的單色畫面類型</string> | ||
1991 | 30 | <string name="display_desktop">顯示桌面</string> | ||
1992 | 31 | <string name="display_reset">重設顯示器</string> | ||
1993 | 32 | <string name="display_screen">顯示空白畫面</string> | ||
1994 | 33 | <string name="display_theme">顯示佈景主題</string> | ||
1995 | 34 | <string name="enable_custom_timeouts">開啟自訂逾時</string> | ||
1996 | 35 | <string name="enter_alert_text">輸入警報文字</string> | ||
1997 | 36 | <string name="home">首頁</string> | ||
1998 | 37 | <string name="httpreturn_unauthorised">未經授權的連結,請輸入有效的帳號和密碼</string> | ||
1999 | 38 | <string name="live_list">現場Live清單</string> | ||
2000 | 39 | <string name="live_view">檢視現場</string> | ||
2001 | 40 | <string name="navigation_drawer_open">打開隱藏式側選單</string> | ||
2002 | 41 | <string name="navigation_drawer_close">關閉隱藏式側選單</string> | ||
2003 | 42 | <string name="none">無</string> | ||
2004 | 43 | <string name="port">連接埠</string> | ||
2005 | 44 | <string name="process">程序</string> | ||
2006 | 45 | <string name="service_list">聚會清單</string> | ||
2007 | 46 | <string name="stage_view">舞台查看</string> | ||
2008 | 47 | <string name="text_size_type">顯示字體尺寸</string> | ||
2009 | 48 | <string name="text_size">選擇顯示字體尺存</string> | ||
2010 | 49 | <string name="text_size_summary">更改聚會文字大小</string> | ||
2011 | 50 | <string name="title_activity_settings">設定</string> | ||
2012 | 51 | <string name="url_hint">主機名或IP</string> | ||
2013 | 52 | <string name="unable">無法處理請求 - 請檢查網路設定</string> | ||
2014 | 53 | </resources> | ||
2015 | 54 | 0 | ||
2016 | === modified file 'app/src/main/res/values/defaultValues.xml' | |||
2017 | --- app/src/main/res/values/defaultValues.xml 2015-01-23 17:53:00 +0000 | |||
2018 | +++ app/src/main/res/values/defaultValues.xml 2015-10-16 19:35:50 +0000 | |||
2019 | @@ -8,4 +8,5 @@ | |||
2020 | 8 | <!-- INTEGER --> | 8 | <!-- INTEGER --> |
2021 | 9 | <integer name="connectionTimeoutDefaultValue">3000</integer> | 9 | <integer name="connectionTimeoutDefaultValue">3000</integer> |
2022 | 10 | <integer name="textSizeDefaultValue">14</integer> | 10 | <integer name="textSizeDefaultValue">14</integer> |
2023 | 11 | |||
2024 | 11 | </resources> | 12 | </resources> |
2025 | 12 | 13 | ||
2026 | === modified file 'app/src/main/res/values/keyStrings.xml' | |||
2027 | --- app/src/main/res/values/keyStrings.xml 2015-01-23 17:53:00 +0000 | |||
2028 | +++ app/src/main/res/values/keyStrings.xml 2015-10-16 19:35:50 +0000 | |||
2029 | @@ -1,4 +1,5 @@ | |||
2030 | 1 | <resources> | 1 | <resources> |
2031 | 2 | <string name="key_auto_scroll">key_auto_scroll</string> | ||
2032 | 2 | <string name="key_enable_custom_timeout">key_enable_custom_timeout</string> | 3 | <string name="key_enable_custom_timeout">key_enable_custom_timeout</string> |
2033 | 3 | <string name="key_connection_timeout">key_connection_timeout</string> | 4 | <string name="key_connection_timeout">key_connection_timeout</string> |
2034 | 4 | <string name="key_text_size">key_text_size</string> | 5 | <string name="key_text_size">key_text_size</string> |
2035 | 5 | 6 | ||
2036 | === modified file 'app/src/main/res/values/strings.xml' | |||
2037 | --- app/src/main/res/values/strings.xml 2015-04-02 20:52:53 +0000 | |||
2038 | +++ app/src/main/res/values/strings.xml 2015-10-16 19:35:50 +0000 | |||
2039 | @@ -26,25 +26,29 @@ | |||
2040 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> |
2041 | 27 | <string name="connection_userid">Username</string> | 27 | <string name="connection_userid">Username</string> |
2042 | 28 | <string name="custom_timeout">Set Custom Timeout</string> | 28 | <string name="custom_timeout">Set Custom Timeout</string> |
2048 | 29 | <string name="display_blank_summary">Select the required blank type</string> | 29 | <string name="display_blank_summary">Select the required display</string> |
2049 | 30 | <string name="display_desktop">Blank display to Desktop</string> | 30 | <string name="display_desktop">Display Desktop background</string> |
2050 | 31 | <string name="display_reset">Reset Display</string> | 31 | <string name="display_list_autoscroll">Allow the selected item to scroll to the centre of the list</string> |
2051 | 32 | <string name="display_screen">Blank display to Blank</string> | 32 | <string name="display_reset">Show Live display</string> |
2052 | 33 | <string name="display_theme">Blank display to Theme</string> | 33 | <string name="display_settings">Display Setting</string> |
2053 | 34 | <string name="display_screen">Display Black only</string> | ||
2054 | 35 | <string name="display_theme">Display Theme only</string> | ||
2055 | 34 | <string name="enable_custom_timeouts">Enable Custom Timeouts</string> | 36 | <string name="enable_custom_timeouts">Enable Custom Timeouts</string> |
2056 | 35 | <string name="enter_alert_text">Enter Alert Text</string> | 37 | <string name="enter_alert_text">Enter Alert Text</string> |
2057 | 38 | <string name="enable_autoscroll">Allow displays to auto center</string> | ||
2058 | 36 | <string name="home">Home</string> | 39 | <string name="home">Home</string> |
2059 | 37 | <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string> | 40 | <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string> |
2060 | 38 | <string name="live_list">Live List</string> | 41 | <string name="live_list">Live List</string> |
2062 | 39 | <string name="live_view">LiveView</string> | 42 | <string name="live_view">Live View</string> |
2063 | 40 | <string name="navigation_drawer_open">Open navigation drawer</string> | 43 | <string name="navigation_drawer_open">Open navigation drawer</string> |
2064 | 41 | <string name="navigation_drawer_close">Close navigation drawer</string> | 44 | <string name="navigation_drawer_close">Close navigation drawer</string> |
2065 | 45 | <string name="next">Next</string> | ||
2066 | 42 | <string name="none">None</string> | 46 | <string name="none">None</string> |
2067 | 43 | <string name="port">Port</string> | 47 | <string name="port">Port</string> |
2068 | 48 | <string name="previous">Previous</string> | ||
2069 | 44 | <string name="process">Process</string> | 49 | <string name="process">Process</string> |
2070 | 45 | <string name="service_list">Service List</string> | 50 | <string name="service_list">Service List</string> |
2071 | 46 | <string name="stage_view">Stage View</string> | 51 | <string name="stage_view">Stage View</string> |
2072 | 47 | <string name="text_size_type">Display Text Size</string> | ||
2073 | 48 | <string name="text_size">Select display text size</string> | 52 | <string name="text_size">Select display text size</string> |
2074 | 49 | <string name="text_size_summary">Change the Service text size</string> | 53 | <string name="text_size_summary">Change the Service text size</string> |
2075 | 50 | <string name="title_activity_settings">Settings</string> | 54 | <string name="title_activity_settings">Settings</string> |
2076 | 51 | 55 | ||
2077 | === modified file 'app/src/main/res/xml/pref_general.xml' | |||
2078 | --- app/src/main/res/xml/pref_general.xml 2015-01-23 17:53:00 +0000 | |||
2079 | +++ app/src/main/res/xml/pref_general.xml 2015-10-16 19:35:50 +0000 | |||
2080 | @@ -8,4 +8,10 @@ | |||
2081 | 8 | android:summary="@string/text_size_summary" | 8 | android:summary="@string/text_size_summary" |
2082 | 9 | android:title="@string/text_size" /> | 9 | android:title="@string/text_size" /> |
2083 | 10 | 10 | ||
2084 | 11 | <CheckBoxPreference | ||
2085 | 12 | android:key="key_auto_scroll" | ||
2086 | 13 | android:defaultValue="false" | ||
2087 | 14 | android:summary="@string/display_list_autoscroll" | ||
2088 | 15 | android:title="@string/enable_autoscroll"/> | ||
2089 | 16 | |||
2090 | 11 | </PreferenceScreen> | 17 | </PreferenceScreen> |
2091 | 12 | 18 | ||
2092 | === modified file 'app/src/main/res/xml/pref_headers.xml' | |||
2093 | --- app/src/main/res/xml/pref_headers.xml 2015-01-23 17:53:00 +0000 | |||
2094 | +++ app/src/main/res/xml/pref_headers.xml 2015-10-16 19:35:50 +0000 | |||
2095 | @@ -4,7 +4,7 @@ | |||
2096 | 4 | 4 | ||
2097 | 5 | <header | 5 | <header |
2098 | 6 | android:fragment="org.openlp.android2.activities.SettingsActivity$GeneralPreferenceFragment" | 6 | android:fragment="org.openlp.android2.activities.SettingsActivity$GeneralPreferenceFragment" |
2100 | 7 | android:title="@string/text_size_type" /> | 7 | android:title="@string/display_settings" /> |
2101 | 8 | 8 | ||
2102 | 9 | <header | 9 | <header |
2103 | 10 | android:fragment="org.openlp.android2.activities.SettingsActivity$NotificationPreferenceFragment" | 10 | android:fragment="org.openlp.android2.activities.SettingsActivity$NotificationPreferenceFragment" |
2104 | 11 | 11 | ||
2105 | === modified file 'build.gradle' | |||
2106 | --- build.gradle 2015-01-19 20:26:35 +0000 | |||
2107 | +++ build.gradle 2015-10-16 19:35:50 +0000 | |||
2108 | @@ -5,7 +5,7 @@ | |||
2109 | 5 | jcenter() | 5 | jcenter() |
2110 | 6 | } | 6 | } |
2111 | 7 | dependencies { | 7 | dependencies { |
2113 | 8 | classpath 'com.android.tools.build:gradle:1.0.0' | 8 | classpath 'com.android.tools.build:gradle:1.2.3' |
2114 | 9 | 9 | ||
2115 | 10 | // NOTE: Do not place your application dependencies here; they belong | 10 | // NOTE: Do not place your application dependencies here; they belong |
2116 | 11 | // in the individual module build.gradle files | 11 | // in the individual module build.gradle files |