Skip to content

Commit

Permalink
Fixed some issues in strings.xml files and in the manifest.
Browse files Browse the repository at this point in the history
  • Loading branch information
fyhertz committed May 3, 2013
1 parent 51c55ba commit cf81e09
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 107 deletions.
9 changes: 2 additions & 7 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.majorkernelpanic.spydroid"
android:versionCode="800"
android:versionName="8.0" >
android:versionCode="801"
android:versionName="8.0.1" >

<uses-sdk
android:minSdkVersion="9"
Expand Down Expand Up @@ -47,11 +47,6 @@
android:name="net.majorkernelpanic.spydroid.ui.OptionsActivity"
android:label="@string/options_activity_title" >
</activity>

<activity
android:name="net.majorkernelpanic.spydroid.ui.AboutActivity"
android:label="@string/about_activity_title" >
</activity>

<service android:name="net.majorkernelpanic.spydroid.api.CustomHttpServer"/>
<service android:name="net.majorkernelpanic.spydroid.api.CustomRtspServer"/>
Expand Down
2 changes: 1 addition & 1 deletion res/layout/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="STREAMING !"
android:text="@string/streaming"
android:textColor="#11FF11"
android:textSize="20sp"
android:visibility="gone" />
Expand Down
76 changes: 0 additions & 76 deletions res/layout/settings.xml

This file was deleted.

25 changes: 20 additions & 5 deletions res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@
<resources>
<string name="options">Optionen</string>
<string name="quit">Beenden</string>
<string name="client">Kunde</string>
<string name="app_name">Spydroid</string>
<string name="description">Fäng live Video- und Audiostreams aus deinem smartphone mit Spydroid an</string>
<string name="line1">Mit Chrome oder Firefox schreib:</string>
<string name="line2">Oder öffne mit VLC:</string>
<string name="about_activity_title">Apropos</string>
<string name="client_activity_title">Kunde</string>
<string name="options_activity_title">Einstellungen</string>
<string name="warning">Schält WLAN ein und verbinde dich mit einem Netz !</string>
<string name="streaming">Streaming !</string>
<string name="notification_title">Spydroid</string>
<string name="notification_content">Achtung ! Spydroid ablaufend ;)</string>
<string name="preview">Start a stream to enable the preview !</string>
<string name="about0">Spydroid ist eine lustige und open source App!</string>
<string name="about1">Wenn du nicht verstehst, wie sie zu benutzen, dann ist die Google Projektseite hier, um dir zu helfen. zB gibt es darauf wertvolle Informationen, um das Stream direkt mit VLC anzufangen.</string>
<string name="about2">Vergiss nicht, die App zu bewerten, es ist wirklich folgenreich, dein Leben hängt davon ab!</string>
Expand All @@ -37,6 +35,23 @@
<string name="settings14">Mehr Optionen</string>
<string name="settings15">Mitteilung</string>
<string name="settings16">Mitteilung anschalten/ abschalten</string>
<string name="settings17">Hack for video streaming</string>
<string name="settings18">Allow video streaming to continue when the app is sent to the background. May not work well :/</string>
<string name="settings19">HTTP server</string>
<string name="settings20">HTTP server port</string>
<string name="settings21">Port used by the HTTP server</string>
<string name="settings22">Enabled</string>
<string name="settings23">Enable/Disable the HTTP server. Leave it on if you don\'t know what you are doing !</string>
<string name="settings24">Use HTTPS</string>
<string name="settings25">NOT STABLE YET !</string>
<string name="settings26">HTTPS server port</string>
<string name="settings27">Port used by the HTTPS server</string>
<string name="settings28">RTSP server</string>
<string name="settings29">Enabled</string>
<string name="settings30">Useful to use Spydroid directly with VLC</string>
<string name="settings31">RTSP server port</string>
<string name="settings32">Port used by the RTSP server</string>
<string name="bind_failed">You need to choose another port for the %s server !</string>
<string name="port_used">Port already in use !</string>
<string name="page0">Main</string>
<string name="page1">Preview</string>
<string name="page2">About</string>
</resources>
3 changes: 0 additions & 3 deletions res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@

<string name="options">Options</string>
<string name="quit">Quitter</string>
<string name="client">Client</string>
<string name="app_name">Spydroid</string>
<string name="description">Accède à distance à la camera et au micro de ton smartphone avec Spydroid</string>
<string name="line1">Dans chrome ou firefox recopie</string>
<string name="line2">Dans VLC ouvre</string>
<string name="about_activity_title">À propos</string>
<string name="client_activity_title">Client</string>
<string name="options_activity_title">Réglages</string>
<string name="warning">Active le wifi ou la fonction hotspot !</string>
<string name="streaming">Streaming !</string>
Expand Down
29 changes: 21 additions & 8 deletions res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@
<resources>
<string name="options">Настройки</string>
<string name="quit">Выход</string>
<string name="client">Клиент</string>
<string name="app_name">Spydroid</string>
<string name="description">Передача потокового видео и звука с вашего смартфона через Spydroid</string>
<string name="line1">Откройте в chrome или firefox</string>
<string name="line2">или в VLC</string>
<string name="about_activity_title">О программе</string>
<string name="client_activity_title">Клиент</string>
<string name="options_activity_title">Настройки</string>
<string name="warning">Включите wifi и подключитесь к сети !</string>
<string name="streaming">Трансляция !</string>
<string name="preview">Start a stream to enable the preview !</string>
<string name="notification_title">Spydroid</string>
<string name="notification_content">Берегись ! Spydroid работает ;)</string>
<string name="client0">Здесь вы можете проигрывать потоки с другого смартфона c работающим Spydroid. Оба смартфонов должны быть подключены к одной и той же беспроводной сети !</string>
<string name="client1">Подключиться</string>
<string name="about0">Spydroid это веселое приложение с открытым исходным кодом!</string>
<string name="about1">Если вам не понятно, как пользоваться данным приложением, вам поможет официальная страница проекта, она находится здесь. К примеру, на ней содержиться ценная информация, как проиграть поток прямо из VLC</string>
<string name="about2">Не забудьте оценить приложение, это очень важно, ваша жизнь зависит от этого!</string>
Expand All @@ -38,7 +34,24 @@
<string name="settings13">Скорость передачи</string>
<string name="settings14">Дополнительные опции</string>
<string name="settings15">Уведомления</string>
<string name="settings16">Включить/Выключить уведомления</string>
<string name="settings17">Hack for video streaming</string>
<string name="settings18">Allow video streaming to continue when the app is sent to the background. May not work well :/</string>
<string name="settings16">Включить/Выключить уведомления</string>
<string name="settings19">HTTP server</string>
<string name="settings20">HTTP server port</string>
<string name="settings21">Port used by the HTTP server</string>
<string name="settings22">Enabled</string>
<string name="settings23">Enable/Disable the HTTP server. Leave it on if you don\'t know what you are doing !</string>
<string name="settings24">Use HTTPS</string>
<string name="settings25">NOT STABLE YET !</string>
<string name="settings26">HTTPS server port</string>
<string name="settings27">Port used by the HTTPS server</string>
<string name="settings28">RTSP server</string>
<string name="settings29">Enabled</string>
<string name="settings30">Useful to use Spydroid directly with VLC</string>
<string name="settings31">RTSP server port</string>
<string name="settings32">Port used by the RTSP server</string>
<string name="bind_failed">You need to choose another port for the %s server !</string>
<string name="port_used">Port already in use !</string>
<string name="page0">Main</string>
<string name="page1">Preview</string>
<string name="page2">About</string>
</resources>
3 changes: 0 additions & 3 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
<resources>
<string name="options">Options</string>
<string name="quit">Quit</string>
<string name="client">Client</string>
<string name="app_name">Spydroid</string>
<string name="description">Capture live video and audio streaming from your smartphone with Spydroid</string>
<string name="line1">In chrome or firefox type</string>
<string name="line2">In VLC open</string>
<string name="about_activity_title">About</string>
<string name="client_activity_title">Client</string>
<string name="options_activity_title">Settings</string>
<string name="warning">Turn on wifi or tethering !</string>
<string name="streaming">Streaming !</string>
Expand Down
2 changes: 0 additions & 2 deletions src/net/majorkernelpanic/spydroid/ui/HandsetFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
Expand Down
2 changes: 0 additions & 2 deletions src/net/majorkernelpanic/spydroid/ui/PreviewFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.app.Fragment;
Expand Down

0 comments on commit cf81e09

Please sign in to comment.