Merge lp:~trb143/openlp/Android2-a4 into lp:openlp/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
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Review via email: mp+274768@code.launchpad.net

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

Subscribers

People subscribed via source and target branches

to all changes: