update strings to transifex

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Preferences.java

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index b206708..2ba0d0f 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -3,9 +3,8 @@
  *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   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, either version 2 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +17,6 @@
  */
 package com.owncloud.android.ui.activity;
 
-import java.io.File;
 import java.util.Vector;
 
 import android.content.Intent;
@@ -26,7 +24,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -102,16 +99,17 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
            /* About App */
        pAboutApp = (Preference) findPreference("about_app");
        if (pAboutApp != null) { 
-               pAboutApp.setTitle(getString(R.string.app_name)+" "+getString(R.string.about_android));
+               pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
                PackageInfo pkg;
                try {
                    pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
-                   pAboutApp.setSummary(getString(R.string.about_version)+" "+pkg.versionName);
+                   pAboutApp.setSummary(String.format(getString(R.string.about_version), pkg.versionName));
                } catch (NameNotFoundException e) {
                    Log_OC.e(TAG, "Error while showing about dialog", e);
                }
        }
        
+       /* DISABLED FOR RELEASE UNTIL FIXED 
        pLogging = (CheckBoxPreference) findPreference("log_to_file");
        if (pLogging != null) {
            pLogging.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@@ -146,6 +144,8 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
             }
         });
        }
+       */
+       
       }
     }