Fix stray DOS line endings

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 3d983b58c45275ad330e1b8f7f2d6e741e915398..9a37aeaf8da68d97b5841da7a837b8228d0b056b 100644 (file)
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:orientation="vertical"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
-    >\r
-<TextView  \r
-    android:id="@+id/suckit"\r
-    android:layout_width="fill_parent" \r
-    android:layout_height="wrap_content" \r
-    android:text="@string/hello"\r
-    />\r
-<EditText\r
-    android:id="@+id/entry"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="wrap_content"\r
-    android:background="@android:drawable/editbox_background"\r
-    />\r
-<Button\r
-    android:id="@+id/go"\r
-    android:layout_width="wrap_content"\r
-    android:layout_height="wrap_content"\r
-    android:text="Go!"\r
-    />\r
-\r
-</LinearLayout>\r
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:id="@+id/suckit"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+<EditText
+    android:id="@+id/entry"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:drawable/editbox_background"
+    />
+<Button
+    android:id="@+id/go"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="Go!"
+    />
+
+</LinearLayout>

diff --git a/res/layout/passwd.xml b/res/layout/passwd.xml
index 897f21990921ae3439b45c300907bccf5c341647..f475e8d3a513049e594284fa5c059bbad1053d0b 100644 (file)
--- a/res/layout/passwd.xml
+++ b/res/layout/passwd.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:orientation="vertical"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
-    android:padding="10dp"\r
-    >\r
-<TextView  \r
-    android:id="@+id/prompt"\r
-    android:layout_width="fill_parent" \r
-    android:layout_height="wrap_content" \r
-    />\r
-<EditText\r
-    android:id="@+id/entry"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="wrap_content"\r
-    android:background="@android:drawable/editbox_background"\r
-    android:password="true"\r
-    />\r
-<LinearLayout\r
-    android:orientation="horizontal"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="wrap_content"\r
-    >\r
-<Button\r
-    android:id="@+id/ok"\r
-    android:layout_width="wrap_content"\r
-    android:layout_height="wrap_content"\r
-    android:text="OK"\r
-    />\r
-<Button\r
-    android:id="@+id/cancel"\r
-    android:layout_width="wrap_content"\r
-    android:layout_height="wrap_content"\r
-    android:text="Cancel"\r
-    />\r
-</LinearLayout>\r
-</LinearLayout>\r
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp"
+    >
+<TextView  
+    android:id="@+id/prompt"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    />
+<EditText
+    android:id="@+id/entry"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:drawable/editbox_background"
+    android:password="true"
+    />
+<LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    >
+<Button
+    android:id="@+id/ok"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="OK"
+    />
+<Button
+    android:id="@+id/cancel"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="Cancel"
+    />
+</LinearLayout>
+</LinearLayout>

diff --git a/res/layout/progressnotif.xml b/res/layout/progressnotif.xml
index 5a44454425df77f1f666c3896a888cf17b9c0eaa..d742e57a68af77ceea4ea38ff30a2010fa44d5e3 100644 (file)
--- a/res/layout/progressnotif.xml
+++ b/res/layout/progressnotif.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:orientation="horizontal"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
-    android:padding="3dp"\r
-    >\r
-\r
-<ImageView\r
-    android:id="@+id/image"\r
-    android:layout_width="wrap_content"\r
-    android:layout_height="fill_parent"\r
-    android:layout_marginRight="10dp"\r
-    />\r
-\r
-<LinearLayout\r
-    android:orientation="vertical"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="wrap_content"\r
-    >\r
-<TextView  \r
-    android:id="@+id/headline"\r
-    android:layout_width="fill_parent" \r
-    android:layout_height="wrap_content" \r
-    android:textStyle="bold"\r
-    />\r
-<ProgressBar\r
-    android:id="@+id/status"\r
-    android:layout_width="fill_parent" \r
-    android:layout_height="wrap_content" \r
-    style="?android:attr/progressBarStyleHorizontal"\r
-    />\r
-\r
-</LinearLayout>\r
-</LinearLayout>\r
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="3dp"
+    >
+
+<ImageView
+    android:id="@+id/image"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:layout_marginRight="10dp"
+    />
+
+<LinearLayout
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    >
+<TextView  
+    android:id="@+id/headline"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:textStyle="bold"
+    />
+<ProgressBar
+    android:id="@+id/status"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    style="?android:attr/progressBarStyleHorizontal"
+    />
+
+</LinearLayout>
+</LinearLayout>

diff --git a/res/layout/textnotif.xml b/res/layout/textnotif.xml
index 473cd8d6769eaa630654be00828133d4c8b5c8b9..1e1060a0f16373591fde22d131a8d6a71f35c184 100644 (file)
--- a/res/layout/textnotif.xml
+++ b/res/layout/textnotif.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:orientation="horizontal"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
-    android:padding="3dp"\r
-    >\r
-\r
-<ImageView\r
-    android:id="@+id/image"\r
-    android:layout_width="wrap_content"\r
-    android:layout_height="fill_parent"\r
-    android:layout_marginRight="10dp"\r
-    />\r
-\r
-<LinearLayout\r
-    android:orientation="vertical"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="wrap_content"\r
-    >\r
-<TextView  \r
-    android:id="@+id/headline"\r
-    android:layout_width="fill_parent" \r
-    android:layout_height="wrap_content" \r
-    android:textStyle="bold"\r
-    />\r
-<TextView  \r
-    android:id="@+id/status"\r
-    android:layout_width="fill_parent" \r
-    android:layout_height="wrap_content" \r
-    />\r
-\r
-</LinearLayout>\r
-</LinearLayout>\r
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="3dp"
+    >
+
+<ImageView
+    android:id="@+id/image"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:layout_marginRight="10dp"
+    />
+
+<LinearLayout
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    >
+<TextView  
+    android:id="@+id/headline"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:textStyle="bold"
+    />
+<TextView  
+    android:id="@+id/status"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    />
+
+</LinearLayout>
+</LinearLayout>

diff --git a/res/values/ids.xml b/res/values/ids.xml
index caa570f73fb0890f24450c9d41a47055a670d974..0161d2fdff3448cb12445f5624080039346f3c87 100644 (file)
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>

 <resources>
     <item name="actionCreateSshKey" type="id"/>
 <resources>
     <item name="actionCreateSshKey" type="id"/>

-    <item name="actionRemoveSshKey" type="id"/>\r
-    \r
+    <item name="actionRemoveSshKey" type="id"/>
+    

 </resources>
\ No newline at end of file
 </resources>
\ No newline at end of file

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cad5d57a9548b8f2fe185f8b6f89a7f2c2be64ae..df7427e096a50dc2b39fc427f63950a235299d04 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<resources>\r
-    <string name="hello">Hello World, Dumload!</string>\r
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, Dumload!</string>

     <string name="app_name">dumload</string>
     <string name="prefSshServerTitle">SSH server</string>
     <string name="preferenceTitle">Preferences</string>
     <string name="app_name">dumload</string>
     <string name="prefSshServerTitle">SSH server</string>
     <string name="preferenceTitle">Preferences</string>


@@ -17,5 +17,5 @@
     <string name="menuGenSshKey">Generate a new SSH key</string>
     <string name="menuDelSshKey">Remove generated SSH key</string>
     <string name="msgNoGenKeyFound">No generated SSH key was found.</string>
     <string name="menuGenSshKey">Generate a new SSH key</string>
     <string name="menuDelSshKey">Remove generated SSH key</string>
     <string name="msgNoGenKeyFound">No generated SSH key was found.</string>

-    <string name="msgKeyExists">A generated key already exists.</string>\r
-</resources>\r
+    <string name="msgKeyExists">A generated key already exists.</string>
+</resources>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 84f2ab77457796f659fc64f645aa95557c61a873..089ff31be0f38174f5202c9f14bf8aaccd1c47cc 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,23 +1,23 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:title="@string/preferenceTitle" >\r
-\r
-    <PreferenceCategory android:title="@string/prefConnection" >\r
-        <EditTextPreference\r
-            android:key="userName"\r
-            android:summary="@string/prefUsernameSummary"\r
-            android:title="@string/prefUsernameTitle" />\r
-        <EditTextPreference\r
-            android:key="server"\r
-            android:summary="@string/prefServerSummary"\r
-            android:title="@string/prefServerTitle" />\r
-        <EditTextPreference\r
-            android:key="port"\r
-            android:summary="@string/prefPortSummary"\r
-            android:title="@string/prefPortTitle" />\r
-        <EditTextPreference\r
-            android:key="defaultUploadPath"\r
-            android:summary="@string/prefDefaultPathSummary"\r
-            android:title="@string/prefDefaultPathTitle" />\r
-    </PreferenceCategory>\r
-\r
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/preferenceTitle" >
+
+    <PreferenceCategory android:title="@string/prefConnection" >
+        <EditTextPreference
+            android:key="userName"
+            android:summary="@string/prefUsernameSummary"
+            android:title="@string/prefUsernameTitle" />
+        <EditTextPreference
+            android:key="server"
+            android:summary="@string/prefServerSummary"
+            android:title="@string/prefServerTitle" />
+        <EditTextPreference
+            android:key="port"
+            android:summary="@string/prefPortSummary"
+            android:title="@string/prefPortTitle" />
+        <EditTextPreference
+            android:key="defaultUploadPath"
+            android:summary="@string/prefDefaultPathSummary"
+            android:title="@string/prefDefaultPathTitle" />
+    </PreferenceCategory>
+

 </PreferenceScreen>
\ No newline at end of file
 </PreferenceScreen>
\ No newline at end of file