diff --git a/RPIMobile/.settings/org.eclipse.jdt.core.prefs b/RPIMobile/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index 7341ab1..0000000 --- a/RPIMobile/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/RPIMobile/AndroidManifest.xml b/RPIMobile/AndroidManifest.xml index 4347b2f..73fb4ae 100755 --- a/RPIMobile/AndroidManifest.xml +++ b/RPIMobile/AndroidManifest.xml @@ -1,13 +1,13 @@ + android:versionCode="9" + android:versionName="1.0.2" > + android:targetSdkVersion="20" /> /lib/rt.jar +-libraryjars C:\Program Files\Java\jdk1.7.0_67\lib\tools.jar \ No newline at end of file diff --git a/RPIMobile/project.properties b/RPIMobile/project.properties index a51151f..54f1d8b 100755 --- a/RPIMobile/project.properties +++ b/RPIMobile/project.properties @@ -1,4 +1,4 @@ target=android-19 -android.library.reference.1=../android-rss-master -android.library.reference.2=../google-play-services_lib -android.library.reference.3=../actionbarsherlock \ No newline at end of file +android.library.reference.1=..\\android-rss-master +android.library.reference.2=..\\actionbarsherlock +android.library.reference.3=../google-play-services_lib diff --git a/RPIMobile/res/layout/laundry_list_item.xml b/RPIMobile/res/layout/laundry_list_item.xml index b666b9a..54dfd81 100755 --- a/RPIMobile/res/layout/laundry_list_item.xml +++ b/RPIMobile/res/layout/laundry_list_item.xml @@ -11,7 +11,7 @@ + + 9 + + diff --git a/RPIMobile/src/edu/rpi/rpimobile/AthleticsFragment.java b/RPIMobile/src/edu/rpi/rpimobile/AthleticsFragment.java index 7900591..f6c6015 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/AthleticsFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/AthleticsFragment.java @@ -8,7 +8,7 @@ import org.mcsoxford.rss.RSSReader; import org.mcsoxford.rss.RSSReaderException; -import edu.rpi.rpimobile.model.RSSObject; +import edu.rpi.rpimobile.model.RSSArticle; import android.content.SharedPreferences; import android.os.AsyncTask; @@ -32,10 +32,10 @@ public class AthleticsFragment extends SherlockFragment { //All variables to be used throughout the function - private ArrayList stories; - private ArrayList tempstories; - private ArrayList finlist = new ArrayList(); - private RSSObject temp; + private ArrayList stories; + private ArrayList tempstories; + private ArrayList finlist = new ArrayList(); + private RSSArticle temp; private ListView rsslist; private RSSListAdapter rssadapter; private MenuItem refreshbutton; @@ -52,8 +52,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, setHasOptionsMenu(true); //initialize data - stories = new ArrayList(); - tempstories = new ArrayList(); + stories = new ArrayList(); + tempstories = new ArrayList(); //set an adapter up for the listview to handle displaying the data @@ -209,7 +209,7 @@ protected Boolean doInBackground(String... params) { logcat( "Parsing feed"); for(int i = 0; i temp){ + private void addtolist(ArrayList temp){ logcat("Combining lists"); logcat("Source list: "+stories.size()+" Temp list: "+temp.size()); @@ -322,7 +322,7 @@ else if (finlist.get(i).getTitle().equals(finlist.get(j).getTitle())) //Because ArrayLists really just store pointers to their objects a deepcopy must be made of each //item and passed to the list individually. This is much more efficient than using the //java.serialize class to do this automatically. - private void assign(ArrayList target, ArrayList source){ + private void assign(ArrayList target, ArrayList source){ logcat( "Starting copy source:"+source.size()+" Target:"+target.size()); target.clear(); //clear the target list diff --git a/RPIMobile/src/edu/rpi/rpimobile/EventsFragment.java b/RPIMobile/src/edu/rpi/rpimobile/EventsFragment.java index e61ed6d..ee6b6ac 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/EventsFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/EventsFragment.java @@ -6,7 +6,7 @@ import org.json.JSONException; import org.json.JSONObject; -import edu.rpi.rpimobile.model.CalEvent; +import edu.rpi.rpimobile.model.CalendarEvent; import android.os.AsyncTask; import android.os.AsyncTask.Status; @@ -31,8 +31,8 @@ public class EventsFragment extends SherlockFragment { //All variables to be used throughout the function private JSONObject jObj; - private ArrayList events; - private CalendarListAdapter listadapter; + private ArrayList events; + private EventsListAdapter listadapter; private MenuItem refreshbutton; private JSONCalendarTask downloadtask; @@ -48,11 +48,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, setHasOptionsMenu(true); //initialize data - events = new ArrayList(); + events = new ArrayList(); //set an adapter up for the listview to handle displaying the data ListView callist = (ListView) rootView.findViewById(R.id.calendarlist); - listadapter = new CalendarListAdapter(this.getSherlockActivity(), events); + listadapter = new EventsListAdapter(this.getSherlockActivity(), events); callist.setAdapter(listadapter); //Start the download of the calendar data @@ -123,7 +123,7 @@ protected Boolean doInBackground(Void... params) { } logcat( "Begining Download"); String data; - CalEvent temp = new CalEvent(); + CalendarEvent temp = new CalendarEvent(); //Try to download data try { data = ( (new HttpClient()).getData(events_JSON_URL)); @@ -146,7 +146,7 @@ protected Boolean doInBackground(Void... params) { //loop through each of the event items in the array for(int i = 0; i events; + private ArrayList events; private LayoutInflater inflater; - public CalendarListAdapter(Context context, ArrayList events_) { + public EventsListAdapter(Context context, ArrayList events_) { //Assign passed list and context to local variables in the class this.context = context; this.events = events_; @@ -56,8 +56,7 @@ public View getView(final int position, View convertView, ViewGroup parent) { //inflate the layout into the parent view inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View itemView = inflater.inflate(R.layout.calendar_list_item, parent, - false); + View itemView = inflater.inflate(R.layout.calendar_list_item, parent, false); //set an OnClickListener on the parent view to launch a link intent when clicked itemView.setOnClickListener(new View.OnClickListener() { diff --git a/RPIMobile/src/edu/rpi/rpimobile/LaundryFragment.java b/RPIMobile/src/edu/rpi/rpimobile/LaundryFragment.java index 29e0c32..be7e149 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/LaundryFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/LaundryFragment.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; - +import java.util.List; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.HttpClient; @@ -11,7 +11,7 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; -import edu.rpi.rpimobile.model.Building; +import edu.rpi.rpimobile.model.LaundryRoom; import android.os.AsyncTask; import android.os.AsyncTask.Status; @@ -33,12 +33,13 @@ public class LaundryFragment extends SherlockFragment { //All variables to be used throughout the function - private ArrayList buildings; - private ListView buildinglist; + private List laundryrooms; + private ListView laundryroomlist; private LaundryListAdapter listadapter; private MenuItem refreshbutton; private AsyncTask downloadtask; + private static String landing_page_url = "http://www.laundryalert.com/cgi-bin/rpi2012/LMPage"; //Initial function @Override @@ -51,13 +52,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, //Allow this fragment to interact with the menu setHasOptionsMenu(true); - //Point the buildings variable to an arraylist of Building objects - buildings = new ArrayList(); + //Point the laundryrooms variable to an ArrayList of LaundryRoom objects + laundryrooms = new ArrayList(); //assign a list adapter to the listview to handle displaying the data - buildinglist = (ListView) rootView.findViewById(R.id.laundrylist); - listadapter = new LaundryListAdapter(this.getActivity(), buildings); - buildinglist.setAdapter(listadapter); + laundryroomlist = (ListView) rootView.findViewById(R.id.laundrylist); + listadapter = new LaundryListAdapter(this.getActivity(), laundryrooms); + laundryroomlist.setAdapter(listadapter); //download the Laundry data downloadtask = new LaundryFragment.Download().execute(); @@ -114,7 +115,7 @@ private class Download extends AsyncTask{ //before the thread is executed set the action bar to show indeterminate progress, usually a spinner protected void onPreExecute(){ getActivity().setProgressBarIndeterminateVisibility(Boolean.TRUE); - buildings.clear(); // empty the buildings to avoid duplicates + laundryrooms.clear(); // empty the laundryrooms to avoid duplicates } @@ -122,8 +123,8 @@ protected void onPreExecute(){ @Override protected Boolean doInBackground(Void... params) { - //temp variable for storing each building - Building temp = new Building(); + //temp variable for storing each laundryroom + LaundryRoom temp = new LaundryRoom(); //temp variable for the website source String source = ""; @@ -132,7 +133,7 @@ protected Boolean doInBackground(Void... params) { try { //try to download the source of the webpage HttpClient httpClient = new DefaultHttpClient(); - HttpGet get = new HttpGet("http://www.laundryalert.com/cgi-bin/rpi2012/LMPage?CallingPage=LMRoom&RoomPersistence=&MachinePersistenceA=023&MachinePersistenceB="); + HttpGet get = new HttpGet(landing_page_url); HttpResponse response = httpClient.execute(get); @@ -143,7 +144,7 @@ protected Boolean doInBackground(Void... params) { e.printStackTrace(); } - //This code parses the webpage source and saves each building's name free washers and dryers, and used washers and dryers. + //This code parses the webpage source and saves each laundry room's name, free washers and dryers, and used washers and dryers. //It is just a simple scrape of the webpage that will be phased out as soon as LaundryAlert has a public API, or RPIMobile //has it's own server for data like this. @@ -151,42 +152,45 @@ protected Boolean doInBackground(Void... params) { //logcat( source); String[] results = source.split("\\s+"); int counter = 0; - for(int i=0; i8&&!(results[i+1].equals("On")&&results[i+2].equals("site"))){ - temp = new Building(); + ++counter; + if(counter > 8 && !(results[i+1].equals("On") && results[i+2].equals("site"))){ + temp = new LaundryRoom(); temp.setTag(results[i].substring(12)); logcat( temp.getTag()); - i++; + ++i; while(!results[i].contains("font")){ logcat( "Concatinating: "+results[i]); temp.setTag(temp.getTag() +" "+results[i]); - i++; + ++i; } logcat( temp.getTag()); - while(!results[i].contains("sans-serif")) i++; - i++; + while(!results[i].contains("sans-serif")) ++i; + ++i; temp.setAvailableWashers(Integer.parseInt(results[i])); logcat("" + temp.getAvailableWashers()); - while(!results[i].contains("sans-serif")) i++; - i++; + while(!results[i].contains("sans-serif")) ++i; + ++i; temp.setAvailableDryers(Integer.parseInt(results[i])); - while(!results[i].contains("sans-serif")) i++; - i++; + while(!results[i].contains("sans-serif")) ++i; + ++i; temp.setUsedWashers(Integer.parseInt(results[i])); - while(!results[i].contains("sans-serif")) i++; - i++; + while(!results[i].contains("sans-serif")) ++i; + ++i; temp.setUsedDryers(Integer.parseInt(results[i])); - buildings.add(temp); + temp.setLaundryRoomURLNumber(j); + laundryrooms.add(temp); + ++j; } } } @@ -198,8 +202,8 @@ protected Boolean doInBackground(Void... params) { protected void onPostExecute(Boolean results) { //code to be ran in the UI thread after the background thread has completed logcat( "Notifying list"); - // sort the buildings ArrayList so that it displays in alphabetical order - Collections.sort(buildings); + // sort the laundryrooms ArrayList so that it displays in alphabetical order + Collections.sort(laundryrooms); //Set the action bar back to normal getActivity().setProgressBarIndeterminateVisibility(Boolean.FALSE); try{ diff --git a/RPIMobile/src/edu/rpi/rpimobile/LaundryListAdapter.java b/RPIMobile/src/edu/rpi/rpimobile/LaundryListAdapter.java index e57ac43..6c9615a 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/LaundryListAdapter.java +++ b/RPIMobile/src/edu/rpi/rpimobile/LaundryListAdapter.java @@ -1,40 +1,42 @@ package edu.rpi.rpimobile; import java.util.ArrayList; -import java.util.Collections; +import java.util.List; import android.content.Context; +import android.content.Intent; +import android.net.Uri; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.TextView; -import edu.rpi.rpimobile.model.Building; +import edu.rpi.rpimobile.model.LaundryRoom; public class LaundryListAdapter extends BaseAdapter { //All variables to be used throughout the function Context context; - ArrayList buildings; + ArrayList laundryrooms; LayoutInflater inflater; - public LaundryListAdapter(Context context, ArrayList buildings_) { + public LaundryListAdapter(Context context, List laundryrooms_) { //Assign passed list and context to local variables in the class this.context = context; - this.buildings = buildings_; + this.laundryrooms = (ArrayList) laundryrooms_; } @Override public int getCount() { //Method to tell Android the amount of items in the list - return buildings.size(); + return laundryrooms.size(); } //These functions are not used in the current implementation @Override public Object getItem(int position) { - return buildings.get(position); + return laundryrooms.get(position); } @Override @@ -47,34 +49,32 @@ public View getView(final int position, View convertView, ViewGroup parent) { //inflate the layout into the parent view inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View itemView = inflater.inflate(R.layout.laundry_list_item, parent, - false); + View itemView = inflater.inflate(R.layout.laundry_list_item, parent, false); // Declare Views and assign them to their respective widgets defined in the xml file - TextView txttitle = (TextView) itemView.findViewById(R.id.building_title); + TextView txttitle = (TextView) itemView.findViewById(R.id.laundryroom_title); TextView txtavai_washers = (TextView) itemView.findViewById(R.id.available_washers); TextView txtavai_dryers = (TextView) itemView.findViewById(R.id.available_dryers); TextView txtused_washers = (TextView) itemView.findViewById(R.id.used_washers); TextView txtused_dryers = (TextView) itemView.findViewById(R.id.used_dryers); - //Onclick listener to eventually be used to open each room's individual laundry status - /*itemView.setOnClickListener(new View.OnClickListener() { + // Onclick listener to open each room's individual laundry status + itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // - + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(laundryrooms.get(position).getLaundryRoomPageURL()))); } - });//*/ + }); // Set the results into TextViews - txttitle.setText(buildings.get(position).getTag()); - txtavai_washers.setText(String.valueOf(buildings.get(position).getAvailableWashers())); - txtavai_dryers.setText(String.valueOf(buildings.get(position).getAvailableDryers())); - txtused_washers.setText(String.valueOf(buildings.get(position).getUsedWashers())); - txtused_dryers.setText(String.valueOf(buildings.get(position).getUsedDryers())); + txttitle.setText(laundryrooms.get(position).getTag()); + txtavai_washers.setText(String.valueOf(laundryrooms.get(position).getAvailableWashers())); + txtavai_dryers.setText(String.valueOf(laundryrooms.get(position).getAvailableDryers())); + txtused_washers.setText(String.valueOf(laundryrooms.get(position).getUsedWashers())); + txtused_dryers.setText(String.valueOf(laundryrooms.get(position).getUsedDryers())); return itemView; } diff --git a/RPIMobile/src/edu/rpi/rpimobile/MainActivity.java b/RPIMobile/src/edu/rpi/rpimobile/MainActivity.java index 57ce242..7479e97 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/MainActivity.java +++ b/RPIMobile/src/edu/rpi/rpimobile/MainActivity.java @@ -131,7 +131,7 @@ public void onDrawerOpened(View drawerView) { } else{ - logcat( "savedInstance state wasn't null"); + logcat("savedInstance state wasn't null"); } logcat( "Oncreate ran"); diff --git a/RPIMobile/src/edu/rpi/rpimobile/MapFragment.java b/RPIMobile/src/edu/rpi/rpimobile/MapFragment.java index 7986d6b..e94dd25 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/MapFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/MapFragment.java @@ -98,7 +98,7 @@ else if (statusCode != ConnectionResult.SUCCESS) } } - private void parseDatabase() // TODO: Update strings.xml value dbTimestamp every time you edit the database + private void parseDatabase() // TODO: Update numeric.xml value dbVersion every time you increment the versionCode in AndroidManifest.xml /** Manages accessing the database file which must be copied into * internal storage (/data/data/.../) on first run because it can't * be accessed directly from the /res/raw directory */ @@ -108,27 +108,15 @@ private void parseDatabase() // TODO: Update strings.xml value dbTimestamp every SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getSherlockActivity()); - final DateFormat df = new SimpleDateFormat("MM/dd/yyyy hh:mm a"); - final String dbTimestampStr = (String) getResources().getText(R.string.dbTimestamp); + final int dbVersionInt = getResources().getInteger(R.integer.dbVersion); + final int dbVersionPrefs = Integer.parseInt(prefs.getString("dbVersion", "0")); - Date dbInstallDate = null; - Date dbTimestamp = null; - - try { - dbInstallDate = df.parse(prefs.getString("dbInstallDate", dbTimestampStr)); - dbTimestamp = df.parse(dbTimestampStr); - } catch (ParseException e) { - // If this is caught: you have incorrectly formatted - // the dbTimestamp string in the strings.xml file - Log.d("RPI", "ParseException in TVGuideFragment. Incorrect dbTimestamp format in strings.xml"); - } - - if (dbTimestamp.after(dbInstallDate)) + if (dbVersionPrefs < dbVersionInt) // i.e. the installed database is older than the one in the apk { final File oldDB = new File(dbPathName); oldDB.delete(); } - prefs.edit().putString("dbInstallDate", df.format(new Date())).commit(); + prefs.edit().putString("dbVersion", Integer.toString(dbVersionInt)); try { diff --git a/RPIMobile/src/edu/rpi/rpimobile/MapListAdapter.java b/RPIMobile/src/edu/rpi/rpimobile/MapListAdapter.java deleted file mode 100644 index 9e1a565..0000000 --- a/RPIMobile/src/edu/rpi/rpimobile/MapListAdapter.java +++ /dev/null @@ -1,107 +0,0 @@ -//// File no longer needed after migrating to ArrayAdapter in MapFragment -//// File not deleted because code may become useful for ListView implementation of TV Guide feature -///** -// * Filename: MapListAdapter.java -// * Author: Peter Piech -// * Date: 12/4/2013 -// * Description: MapListAdapter class draws the ListView -// * from the MapFragment class. -// */ -// -//package edu.rpi.rpimobile; -// -//import java.util.ArrayList; -// -//import com.google.android.gms.common.ConnectionResult; -//import com.google.android.gms.common.GooglePlayServicesUtil; -// -//import edu.rpi.rpimobile.model.MapLocation; -// -// -//import android.content.Context; -//import android.support.v4.app.FragmentManager; -//import android.support.v4.app.FragmentTransaction; -//import android.view.LayoutInflater; -//import android.view.View; -//import android.view.ViewGroup; -//import android.widget.BaseAdapter; -//import android.widget.TextView; -//import android.widget.Toast; -// -//public class MapListAdapter extends BaseAdapter -///** Class used to draw the ListView of places on campus. Necessary. */ -//{ -// -// private Context context; -// private ArrayList places; -// private LayoutInflater inflater; -// private FragmentManager fragmentManager; -// -// public MapListAdapter(Context context_, ArrayList places_, FragmentManager fm_) -// { -// this.context = context_; -// this.places = places_; -// this.fragmentManager = fm_; -// } -// -// @Override -// public int getCount() { -// return places.size(); -// } -// -// @Override -// public Object getItem(int position) { -// return places.get(position); -// } -// -// @Override -// public long getItemId(int index) { -// return index; -// } -// -// @Override -// public View getView(final int index, View convertView, ViewGroup parent) { -// -// inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); -// View itemView = inflater.inflate(R.layout.map_list_item, parent, false); -// -// TextView tvName = (TextView) itemView.findViewById(R.id.placename); -// tvName.setText(places.get(index).getName()); -// -// itemView.setOnClickListener(new View.OnClickListener() { -// -// @Override -// public void onClick(View v) { -// int statusCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(context); -// if (statusCode == ConnectionResult.SUCCESS) -// { -// ViewMapFragment vmf = new ViewMapFragment(); -// vmf.setMapParameters(places.get(index).getName(), -// places.get(index).getLatitude(), -// places.get(index).getLongitude()); -// -// FragmentTransaction ft = fragmentManager.beginTransaction(); -//// if (fragmentManager.findFragmentById(R.id.mapview) != null) -//// /* handle the duplicate id error that crashes the app -//// if the fragment had already been inflated once before */ -//// { -//// //delete the fragment, so it can be rebuilt: -//// (ft.remove(fragmentManager.findFragmentById(R.id.mapview))).commit(); -//// } -//// ft = fragmentManager.beginTransaction(); -// ft.addToBackStack(null); -// ft.replace(R.id.content_frame, vmf); -// ft.commit(); -// } -// else if (statusCode != ConnectionResult.SUCCESS) -// { -// android.widget.Toast.makeText(context, "Install the latest version of Google Play Services to use this feature", Toast.LENGTH_LONG).show(); -// } -// } -// }); -// -// return itemView; -// -// } -// -//} \ No newline at end of file diff --git a/RPIMobile/src/edu/rpi/rpimobile/PrefsActivity.java b/RPIMobile/src/edu/rpi/rpimobile/PrefsActivity.java index f8fca1c..8369d7a 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/PrefsActivity.java +++ b/RPIMobile/src/edu/rpi/rpimobile/PrefsActivity.java @@ -9,9 +9,9 @@ public class PrefsActivity extends PreferenceActivity //Very simple activity that launches a PreferenceActivity and populates it was a prefs.xml file @Override protected void onCreate(Bundle savedInstanceState) + // TODO : update strings.xml arrays to allow for selection of newly added fragments { super.onCreate(savedInstanceState); addPreferencesFromResource(R.layout.prefs); - //addPreferencesFromResource(R.layout.prefs_twitter); } } diff --git a/RPIMobile/src/edu/rpi/rpimobile/RSSListAdapter.java b/RPIMobile/src/edu/rpi/rpimobile/RSSListAdapter.java index 3c12e71..0d56023 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/RSSListAdapter.java +++ b/RPIMobile/src/edu/rpi/rpimobile/RSSListAdapter.java @@ -3,7 +3,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; -import edu.rpi.rpimobile.model.RSSObject; +import edu.rpi.rpimobile.model.RSSArticle; import android.content.Context; import android.content.Intent; @@ -19,10 +19,10 @@ public class RSSListAdapter extends BaseAdapter { // Declare Variables Context context; AthleticsFragment fragment; - ArrayList items; + ArrayList items; LayoutInflater inflater; - public RSSListAdapter(Context context_, AthleticsFragment fragment_, ArrayList items_) { + public RSSListAdapter(Context context_, AthleticsFragment fragment_, ArrayList items_) { //Assign passed list and context to local variables in the class this.context = context_; this.fragment = fragment_; diff --git a/RPIMobile/src/edu/rpi/rpimobile/TVGuideFragment.java b/RPIMobile/src/edu/rpi/rpimobile/TVGuideFragment.java index 0fd4e49..78a680b 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/TVGuideFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/TVGuideFragment.java @@ -68,7 +68,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa return rootView; } - private void parseDatabase() // TODO: Update strings.xml value dbTimestamp every time you edit the database + private void parseDatabase() // TODO: Update numeric.xml value dbVersion every time you increment the versionCode in AndroidManifest.xml /** Manages accessing the database file which must be copied into * internal storage (/data/data/.../) on first run because it can't * be accessed directly from the /res/raw directory */ @@ -78,27 +78,16 @@ private void parseDatabase() // TODO: Update strings.xml value dbTimestamp every SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getSherlockActivity()); - final DateFormat df = new SimpleDateFormat("MM/dd/yyyy hh:mm a"); - final String dbTimestampStr = (String) getResources().getText(R.string.dbTimestamp); + final int dbVersionInt = getResources().getInteger(R.integer.dbVersion); + final int dbVersionPrefs = Integer.parseInt(prefs.getString("dbVersion", "0")); - Date dbInstallDate = null; - Date dbTimestamp = null; - - try { - dbInstallDate = df.parse(prefs.getString("dbInstallDate", dbTimestampStr)); - dbTimestamp = df.parse(dbTimestampStr); - } catch (ParseException e) { - // If this is caught: you have incorrectly formatted - // the dbTimestamp string in the strings.xml file - Log.d("RPI", "ParseException in TVGuideFragment. Incorrect dbTimestamp format in strings.xml"); - } - - if (dbTimestamp.after(dbInstallDate)) + if (dbVersionPrefs < dbVersionInt) { final File oldDB = new File(dbPathName); oldDB.delete(); } - prefs.edit().putString("dbInstallDate", df.format(new Date())).commit(); + prefs.edit().putString("dbVersion", Integer.toString(dbVersionInt)); + try { // check to see if database already exists in internal storage diff --git a/RPIMobile/src/edu/rpi/rpimobile/TweetListAdapter.java b/RPIMobile/src/edu/rpi/rpimobile/TweetListAdapter.java index ac73b37..a08ca3b 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/TweetListAdapter.java +++ b/RPIMobile/src/edu/rpi/rpimobile/TweetListAdapter.java @@ -4,7 +4,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; -import edu.rpi.rpimobile.model.TweetObject; +import edu.rpi.rpimobile.model.Tweet; import android.content.Context; import android.graphics.Bitmap; @@ -21,10 +21,10 @@ public class TweetListAdapter extends BaseAdapter { // Declare Variables Context context; - ArrayList tweets; + ArrayList tweets; LayoutInflater inflater; - public TweetListAdapter(Context context, ArrayList tweets_) { + public TweetListAdapter(Context context, ArrayList tweets_) { this.context = context; this.tweets = tweets_; } diff --git a/RPIMobile/src/edu/rpi/rpimobile/TwitterFragment.java b/RPIMobile/src/edu/rpi/rpimobile/TwitterFragment.java index 746e9bb..89bf57e 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/TwitterFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/TwitterFragment.java @@ -12,7 +12,7 @@ import org.apache.http.util.ByteArrayBuffer; -import edu.rpi.rpimobile.model.TweetObject; +import edu.rpi.rpimobile.model.Tweet; import twitter4j.Twitter; import twitter4j.TwitterException; import twitter4j.TwitterFactory; @@ -42,11 +42,11 @@ public class TwitterFragment extends SherlockFragment { //All variables to be used throughout the function - private TweetObject temp = new TweetObject(); - private ArrayList tweets = new ArrayList(); - private ArrayList temptweets = new ArrayList(); + private Tweet temp = new Tweet(); + private ArrayList tweets = new ArrayList(); + private ArrayList temptweets = new ArrayList(); - private ArrayList finlist = new ArrayList(); + private ArrayList finlist = new ArrayList(); private ListView tweetlist; private TweetListAdapter tweetadapter; @@ -65,7 +65,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, setHasOptionsMenu(true); //Assign the tweets variable to a new Arraylist of tweetobject objects - tweets = new ArrayList(); + tweets = new ArrayList(); //Set the listview to an adapter to handle displaying the data tweetlist = (ListView) rootView.findViewById(R.id.tweetlist); @@ -284,7 +284,7 @@ protected Boolean doInBackground(String... params) { for (twitter4j.Status status : statuses) { logcat( "Looping status"); //temp object - temp = new TweetObject(); + temp = new Tweet(); String avatarurl; //status must be handled differently if it is normal or a retweet if(!status.isRetweet()){ @@ -406,7 +406,7 @@ private boolean downloadFromUrl(String imageURL, String fileName) { } //Class to add tweets to the "tweets" list - private void addtotweets(ArrayList temp){ + private void addtotweets(ArrayList temp){ logcat("Combining lists"); logcat("Tweets list: "+tweets.size()+" Temp list: "+temp.size()); @@ -450,7 +450,7 @@ else if(tweets.get(tweetcounter).getTime().before(temp.get(tempcounter).getTime( //Because ArrayLists really just store pointers to their objects a deepcopy must be made of each //item and passed to the list individually. This is much more efficient than using the //java.serialize class to do this automatically. - private void assign(ArrayList target, ArrayList source){ + private void assign(ArrayList target, ArrayList source){ logcat( "Starting copy source:"+source.size()+" Target:"+target.size()); //clear the target list target.clear(); diff --git a/RPIMobile/src/edu/rpi/rpimobile/WeatherFragment.java b/RPIMobile/src/edu/rpi/rpimobile/WeatherFragment.java index 07e0d3c..3f5f742 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/WeatherFragment.java +++ b/RPIMobile/src/edu/rpi/rpimobile/WeatherFragment.java @@ -3,7 +3,7 @@ import org.json.JSONException; import org.json.JSONObject; -import edu.rpi.rpimobile.model.Weathervars; +import edu.rpi.rpimobile.model.Weather; import android.content.SharedPreferences; import android.graphics.Bitmap; @@ -18,7 +18,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.ImageView.ScaleType; import android.widget.TextView; import android.widget.Toast; @@ -37,7 +36,7 @@ public class WeatherFragment extends SherlockFragment private TextView hilowview; private ImageView iconview; private JSONObject jObj; - private Weathervars today; + private Weather today; private MenuItem refreshbutton; private JSONWeatherTask downloadtask; @@ -60,7 +59,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, iconview = (ImageView) rootView.findViewById(R.id.weathericon); //populate the "today" weather item with an instance of the Weathervars class and intital values - today = new Weathervars(); + today = new Weather(); today.setTemperature((float) 255.372); //0f in Kelvin @@ -131,7 +130,7 @@ public boolean onOptionsItemSelected(MenuItem item) { //AsyncTask thread to download weather data - private class JSONWeatherTask extends AsyncTask { + private class JSONWeatherTask extends AsyncTask { private static final String troyID = "http://api.openweathermap.org/data/2.5/weather?id=5141502"; private static final String image_URL_prefix = "http://openweathermap.org/img/w/"; @@ -144,7 +143,7 @@ protected void onPreExecute(){ //Class to be ran in another thread @Override - protected Weathervars doInBackground(Void... params) { + protected Weather doInBackground(Void... params) { logcat( "WeatherdoInBackground started"); //If a looper hasn't already been prepared by another thread prepare one for this application if (Looper.myLooper()==null) { @@ -152,10 +151,10 @@ protected Weathervars doInBackground(Void... params) { } logcat( "Begining Download"); String data; - today = new Weathervars(); + today = new Weather(); //Try to download data try { - data = (new HttpClient()).getData(troyID);//+"&units=imperial")); + data = (new HttpClient()).getData(troyID); logcat( "downloaded data of length "+data.length()); } catch(Exception e){ @@ -175,9 +174,9 @@ protected Weathervars doInBackground(Void... params) { String tempicon = jObj.getJSONArray("weather").getJSONObject(0).getString("icon"); logcat( "Downloading icon: "+tempicon); - today.setIcon((new HttpClient()).getImage(image_URL_prefix + tempicon)); + today.setIcon((new HttpClient()).getImage(image_URL_prefix + tempicon + ".png")); - } catch (JSONException e) { + } catch (JSONException e) { e.printStackTrace(); } @@ -192,7 +191,7 @@ protected Weathervars doInBackground(Void... params) { @Override - protected void onPostExecute(Weathervars weather) { + protected void onPostExecute(Weather weather) { //code to be ran in the UI thread after the background thread has completed super.onPostExecute(weather); //Set the action bar back to normal @@ -205,36 +204,38 @@ protected void onPostExecute(Weathervars weather) { private void SetDisplay(boolean onCreateViewFirstRun){ //code to update the UI with all of the variables in the "today" object //if anything was actually downloaded - if(today.getLocation() != null && today.getLocation().length()>0){ + if(today.getLocation() != null && today.getLocation().length()>0) + { logcat( "Setting temp to "+(today.getTemperature())); //try to populate all views - try{ - //temperature is converted to the proper units as it is populated - tempview.setText(tempconvert(today.getTemperature())); - //The high/low is just one textview with a linebreak - hilowview.setText("High: "+tempconvert(today.getTempHigh())+"\nLow: "+tempconvert(today.getTempLow())); - //Same with the condition and location - cityview.setText(today.getCondition() + "\n" + today.getLocation()); - - //Additional code for parsing the icon when it is eventually used - logcat( "Checking image"); - if (today.getIcon() != null && today.getIcon().length > 0) { - logcat( "Setting Image"); - Bitmap img = BitmapFactory.decodeByteArray(today.getIcon(), 0, today.getIcon().length); - iconview.setImageBitmap(img); - } - else if (!onCreateViewFirstRun) - // we don't want this message to display when we KNOW it WILL fail + try { - Toast.makeText(getSherlockActivity(), "Icon Download Failed", Toast.LENGTH_SHORT).show(); - } - + //temperature is converted to the proper units as it is populated + tempview.setText(tempconvert(today.getTemperature())); + // The high/low is just one textview with a linebreak + hilowview.setText("High: "+tempconvert(today.getTempHigh())+"\nLow: "+tempconvert(today.getTempLow())); + //Same with the condition and location + cityview.setText(today.getCondition() + "\n" + today.getLocation()); + + // Code for parsing the icon + logcat( "Checking image"); + if (today.getIcon() != null && today.getIcon().length > 0) { + logcat("Setting Image"); + Bitmap img = BitmapFactory.decodeByteArray(today.getIcon(), 0, today.getIcon().length); + iconview.setImageBitmap(img); + } + else if (!onCreateViewFirstRun) + // we don't want this message to display when we KNOW it WILL fail + { + Toast.makeText(getSherlockActivity(), "Icon Download Failed", Toast.LENGTH_SHORT).show(); + } } - catch(Exception e){ + catch(Exception e) + { logcat( e.toString()); } - } + } //if there isn't any data then alert the user else { diff --git a/RPIMobile/src/edu/rpi/rpimobile/model/CalEvent.java b/RPIMobile/src/edu/rpi/rpimobile/model/CalendarEvent.java similarity index 97% rename from RPIMobile/src/edu/rpi/rpimobile/model/CalEvent.java rename to RPIMobile/src/edu/rpi/rpimobile/model/CalendarEvent.java index 56d0081..4f65061 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/model/CalEvent.java +++ b/RPIMobile/src/edu/rpi/rpimobile/model/CalendarEvent.java @@ -2,7 +2,7 @@ //Class for storing all of the variables associated with a Calendar call -public final class CalEvent { +public final class CalendarEvent { //public String title; private String summary; diff --git a/RPIMobile/src/edu/rpi/rpimobile/model/Building.java b/RPIMobile/src/edu/rpi/rpimobile/model/LaundryRoom.java similarity index 63% rename from RPIMobile/src/edu/rpi/rpimobile/model/Building.java rename to RPIMobile/src/edu/rpi/rpimobile/model/LaundryRoom.java index 9ee63d8..09e7df2 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/model/Building.java +++ b/RPIMobile/src/edu/rpi/rpimobile/model/LaundryRoom.java @@ -1,7 +1,7 @@ package edu.rpi.rpimobile.model; //Class for storing all of the variables associated with a laundry call -public final class Building implements Comparable +public final class LaundryRoom implements Comparable { private String tag = ""; @@ -9,22 +9,30 @@ public final class Building implements Comparable private int available_dryers = 0; private int used_washers = 0; private int used_dryers = 0; + private int laundryroom_url_number = 0; + private static final String room_page_url = "http://www.laundryalert.com/cgi-bin/rpi2012/LMRoom?Halls="; + + // Getters: public String getTag() { return new String(this.tag); } public int getAvailableWashers() { return Integer.valueOf(this.available_washers); } public int getAvailableDryers() { return Integer.valueOf(this.available_dryers); } public int getUsedWashers() { return Integer.valueOf(this.used_washers); } - public int getUsedDryers() { return Integer.valueOf(this.used_dryers); } + public int getUsedDryers() { return Integer.valueOf(this.used_dryers); } + public int getLaundryRoomURLNumber() { return Integer.valueOf(this.laundryroom_url_number); } + public String getLaundryRoomPageURL() { return new String(room_page_url + laundryroom_url_number); } + + // Setters: public void setTag(String tag_) { this.tag = tag_; } public void setAvailableWashers(int available_) { this.available_washers = available_; } public void setAvailableDryers(int available_) { this.available_dryers = available_; } public void setUsedWashers(int used_) { this.used_washers = used_; } public void setUsedDryers(int used_) { this.used_dryers = used_; } + public void setLaundryRoomURLNumber(int hall_num) { this.laundryroom_url_number = hall_num; } - // compare buildings according to their name + // Compare buildings according to their name @Override - public int compareTo(Building b) { + public int compareTo(LaundryRoom b) { return this.getTag().compareTo(b.getTag()); } - } \ No newline at end of file diff --git a/RPIMobile/src/edu/rpi/rpimobile/model/RSSObject.java b/RPIMobile/src/edu/rpi/rpimobile/model/RSSArticle.java similarity index 89% rename from RPIMobile/src/edu/rpi/rpimobile/model/RSSObject.java rename to RPIMobile/src/edu/rpi/rpimobile/model/RSSArticle.java index bb6340d..b7d85af 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/model/RSSObject.java +++ b/RPIMobile/src/edu/rpi/rpimobile/model/RSSArticle.java @@ -3,7 +3,7 @@ import java.util.Date; //Class for storing all of the variables associated with a RSS call -public final class RSSObject +public final class RSSArticle { private String title; private String link; @@ -11,9 +11,9 @@ public final class RSSObject private String category; - public RSSObject deepcopy() + public RSSArticle deepcopy() { - RSSObject copy = new RSSObject(); + RSSArticle copy = new RSSArticle(); copy.title = title; copy.link = link; copy.time = time; diff --git a/RPIMobile/src/edu/rpi/rpimobile/model/TweetObject.java b/RPIMobile/src/edu/rpi/rpimobile/model/Tweet.java similarity index 89% rename from RPIMobile/src/edu/rpi/rpimobile/model/TweetObject.java rename to RPIMobile/src/edu/rpi/rpimobile/model/Tweet.java index 883cfad..a77294b 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/model/TweetObject.java +++ b/RPIMobile/src/edu/rpi/rpimobile/model/Tweet.java @@ -3,7 +3,7 @@ import java.util.Date; //Class for storing all of the variables associated with a twitter call -public final class TweetObject{ +public final class Tweet{ private String avatar; private String username; @@ -11,9 +11,9 @@ public final class TweetObject{ private String body; //Deep copy method to return a new object with no links to the original - public TweetObject deepcopy() + public Tweet deepcopy() { - TweetObject temp = new TweetObject(); + Tweet temp = new Tweet(); temp.avatar = avatar; temp.username = username; temp.time = time; diff --git a/RPIMobile/src/edu/rpi/rpimobile/model/Weathervars.java b/RPIMobile/src/edu/rpi/rpimobile/model/Weather.java similarity index 96% rename from RPIMobile/src/edu/rpi/rpimobile/model/Weathervars.java rename to RPIMobile/src/edu/rpi/rpimobile/model/Weather.java index c8f4724..03abe21 100644 --- a/RPIMobile/src/edu/rpi/rpimobile/model/Weathervars.java +++ b/RPIMobile/src/edu/rpi/rpimobile/model/Weather.java @@ -3,7 +3,7 @@ import java.util.Arrays; //Class for storing all of the variables associated with a weather call -public final class Weathervars{ +public final class Weather{ private String location; private Float temperature; private Float temphigh; @@ -13,7 +13,7 @@ public final class Weathervars{ private byte[] icon; //create method to initialize all variables - public Weathervars() + public Weather() { location = ""; temperature = (float)0; diff --git a/actionbarsherlock/.settings/org.eclipse.jdt.core.prefs b/actionbarsherlock/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index b080d2d..0000000 --- a/actionbarsherlock/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/actionbarsherlock/libs/android-support-v4.jar b/actionbarsherlock/libs/android-support-v4.jar index 187bdf4..c31cede 100755 Binary files a/actionbarsherlock/libs/android-support-v4.jar and b/actionbarsherlock/libs/android-support-v4.jar differ diff --git a/google-play-services_lib/.classpath b/google-play-services_lib/.classpath index d57ec02..7bc01d9 100644 --- a/google-play-services_lib/.classpath +++ b/google-play-services_lib/.classpath @@ -1,9 +1,9 @@ - - + + diff --git a/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs b/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2d..0000000 --- a/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/google-play-services_lib/AndroidManifest.xml b/google-play-services_lib/AndroidManifest.xml index aecd02b..d17da08 100644 --- a/google-play-services_lib/AndroidManifest.xml +++ b/google-play-services_lib/AndroidManifest.xml @@ -1,9 +1,17 @@ - - + + + diff --git a/google-play-services_lib/libs/google-play-services.jar b/google-play-services_lib/libs/google-play-services.jar index 67d5647..2b1aa4d 100644 Binary files a/google-play-services_lib/libs/google-play-services.jar and b/google-play-services_lib/libs/google-play-services.jar differ diff --git a/google-play-services_lib/lint.xml b/google-play-services_lib/lint.xml deleted file mode 100644 index ee0eead..0000000 --- a/google-play-services_lib/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/google-play-services_lib/res/color/wallet_primary_text_holo_light.xml b/google-play-services_lib/res/color/wallet_primary_text_holo_light.xml new file mode 100644 index 0000000..9c2c0fb --- /dev/null +++ b/google-play-services_lib/res/color/wallet_primary_text_holo_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/google-play-services_lib/res/color/wallet_secondary_text_holo_dark.xml b/google-play-services_lib/res/color/wallet_secondary_text_holo_dark.xml new file mode 100644 index 0000000..0fa1a76 --- /dev/null +++ b/google-play-services_lib/res/color/wallet_secondary_text_holo_dark.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/google-play-services_lib/res/drawable-hdpi/powered_by_google_dark.png b/google-play-services_lib/res/drawable-hdpi/powered_by_google_dark.png new file mode 100644 index 0000000..721905c Binary files /dev/null and b/google-play-services_lib/res/drawable-hdpi/powered_by_google_dark.png differ diff --git a/google-play-services_lib/res/drawable-hdpi/powered_by_google_light.png b/google-play-services_lib/res/drawable-hdpi/powered_by_google_light.png new file mode 100644 index 0000000..53328af Binary files /dev/null and b/google-play-services_lib/res/drawable-hdpi/powered_by_google_light.png differ diff --git a/google-play-services_lib/res/drawable-mdpi/powered_by_google_dark.png b/google-play-services_lib/res/drawable-mdpi/powered_by_google_dark.png new file mode 100644 index 0000000..a152807 Binary files /dev/null and b/google-play-services_lib/res/drawable-mdpi/powered_by_google_dark.png differ diff --git a/google-play-services_lib/res/drawable-mdpi/powered_by_google_light.png b/google-play-services_lib/res/drawable-mdpi/powered_by_google_light.png new file mode 100644 index 0000000..015a0ad Binary files /dev/null and b/google-play-services_lib/res/drawable-mdpi/powered_by_google_light.png differ diff --git a/google-play-services_lib/res/drawable-xhdpi/powered_by_google_dark.png b/google-play-services_lib/res/drawable-xhdpi/powered_by_google_dark.png new file mode 100644 index 0000000..ffd9126 Binary files /dev/null and b/google-play-services_lib/res/drawable-xhdpi/powered_by_google_dark.png differ diff --git a/google-play-services_lib/res/drawable-xhdpi/powered_by_google_light.png b/google-play-services_lib/res/drawable-xhdpi/powered_by_google_light.png new file mode 100644 index 0000000..d9f0593 Binary files /dev/null and b/google-play-services_lib/res/drawable-xhdpi/powered_by_google_light.png differ diff --git a/google-play-services_lib/res/drawable-xxhdpi/powered_by_google_dark.png b/google-play-services_lib/res/drawable-xxhdpi/powered_by_google_dark.png new file mode 100644 index 0000000..0165a01 Binary files /dev/null and b/google-play-services_lib/res/drawable-xxhdpi/powered_by_google_dark.png differ diff --git a/google-play-services_lib/res/drawable-xxhdpi/powered_by_google_light.png b/google-play-services_lib/res/drawable-xxhdpi/powered_by_google_light.png new file mode 100644 index 0000000..aa6b6db Binary files /dev/null and b/google-play-services_lib/res/drawable-xxhdpi/powered_by_google_light.png differ diff --git a/google-play-services_lib/res/values-af/strings.xml b/google-play-services_lib/res/values-af/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-af/strings.xml rename to google-play-services_lib/res/values-af/common_strings.xml index 1b211f5..3a388b0 100644 --- a/google-play-services_lib/res/values-af/strings.xml +++ b/google-play-services_lib/res/values-af/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play Services-fout" + "\'n Program vereis dat Google Play Services geïnstalleer word." + "\'n Program vereis dat Google Play Services opgedateer word." + "\'n Program vereis dat Google Play Services geaktiveer word." + "Versoek deur %1$s" "Kry Google Play-dienste" "Hierdie program sal nie loop sonder Google Play-dienste nie, wat nie op jou foon is nie." "Hierdie program sal nie loop sonder Google Play-dienste nie, wat nie op jou tablet is nie." @@ -21,11 +26,4 @@ "Dateer op" "Meld aan" "Meld aan met Google" - - "\'n Program het probeer om \'n slegte weergawe van Google Play-dienste te gebruik." - "\'n Program vereis dat Google Play-dienste geaktiveer word." - "\'n Program vereis dat Google Play-dienste geïnstalleer word." - "\'n Program vereis \'n opdatering vir Google Play-dienste." - "Google Play-dienstefout" - "Versoek deur %1$s" diff --git a/google-play-services_lib/res/values-am/strings.xml b/google-play-services_lib/res/values-am/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-am/strings.xml rename to google-play-services_lib/res/values-am/common_strings.xml index 2585210..1c5df4f 100644 --- a/google-play-services_lib/res/values-am/strings.xml +++ b/google-play-services_lib/res/values-am/common_strings.xml @@ -1,6 +1,11 @@ + "የGoogle Play አገልግሎቶች ስህተት" + "አንድ መተግበሪያ የGoogle Play አገልግሎቶች እንዲጫኑ ይፈልጋል።" + "አንድ መተግበሪያ የGoogle Play አገልግሎቶች እንዲዘምኑ ይፈልጋል።" + "አንድ መተግበሪያ የGoogle Play አገልግሎቶች እንዲነቁ ይፈልጋል።" + "በ%1$s የተጠየቀ" "Google Play አገልግሎቶችን አግኝ" "ይህ መተግበሪያ ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ ስልክዎ ላይ የሉም።" "ይህ መተግበሪያ ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ ጡባዊዎ ላይ የሉም።" @@ -21,11 +26,4 @@ "ያዘምኑ" "ግባ" "በGoogle ይግቡ" - - "መተግበሪያው የGoogle Play አገልግሎቶችን መጥፎ ስሪት ለመጠቀም ሞክሯል።" - "መተግበሪያው Google Play አገልግሎቶች እንዲነቁ ይፈልጋል።" - "መተግበሪያው Google Play አገልግሎቶች እንዲጫኑ ይፈልጋል።" - "መተግበሪያው Google Play አገልግሎቶች እንዲዘምን ይፈልጋል።" - "የGoogle Play አገልግሎቶች ስህተት" - "በ%1$s የተጠየቀ" diff --git a/google-play-services_lib/res/values-ar/strings.xml b/google-play-services_lib/res/values-ar/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-ar/strings.xml rename to google-play-services_lib/res/values-ar/common_strings.xml index 9451b37..357ca9f 100644 --- a/google-play-services_lib/res/values-ar/strings.xml +++ b/google-play-services_lib/res/values-ar/common_strings.xml @@ -1,6 +1,11 @@ + "‏خطأ في خدمات Google Play" + "‏يتطلب أحد التطبيقات تثبيت خدمات Google Play." + "‏يتطلب أحد التطبيقات تحديث خدمات Google Play." + "‏يتطلب أحد التطبيقات تمكين خدمات Google Play." + "تم الطلب عن طريق %1$s" "‏الحصول على خدمات Google Play" "‏لن يتم تشغيل هذا التطبيق بدون خدمات Google Play، والتي لا تتوفر في هاتفك." "‏لن يتم تشغيل هذا التطبيق بدون خدمات Google Play، والتي لا تتوفر في جهازك اللوحي." @@ -21,11 +26,4 @@ "تحديث" "تسجيل الدخول" "‏تسجيل الدخول باستخدام Google" - - "‏يحاول أحد التطبيقات استخدام إصدار غير صالح من خدمات Google Play." - "‏يتطلب أحد التطبيقات تمكين خدمات Google Play." - "‏يتطلب أحد التطبيقات تثبيت خدمات Google Play." - "‏يتطلب أحد التطبيقات تحديث خدمات Google Play." - "‏خطأ في خدمات Google Play" - "تم الطلب عن طريق %1$s" diff --git a/google-play-services_lib/res/values-be/strings.xml b/google-play-services_lib/res/values-be/common_strings.xml similarity index 76% rename from google-play-services_lib/res/values-be/strings.xml rename to google-play-services_lib/res/values-be/common_strings.xml index 81382d1..03c0cdd 100644 --- a/google-play-services_lib/res/values-be/strings.xml +++ b/google-play-services_lib/res/values-be/common_strings.xml @@ -26,11 +26,4 @@ "Абнавіць" "Увайсцi" "Увайсці ў Google" - - "Прыкладанне паспрабавала скарыстацца сапсаванай версіяй службаў Google Play." - "Прыкладанне патрабуе ўключэння службаў Google Play." - "Прыкладанне патрабуе ўсталявання службаў Google Play." - "Прыкладанне патрабуе абнаўлення службаў Google Play." - "Памылка службаў Google Play" - "Запытана прыкладаннем %1$s" diff --git a/google-play-services_lib/res/values-bg/strings.xml b/google-play-services_lib/res/values-bg/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-bg/strings.xml rename to google-play-services_lib/res/values-bg/common_strings.xml index bb8da3c..4aa01ec 100644 --- a/google-play-services_lib/res/values-bg/strings.xml +++ b/google-play-services_lib/res/values-bg/common_strings.xml @@ -1,6 +1,11 @@ + "Грешка в услугите за Google Play" + "Приложение изисква инсталирането на услугите за Google Play." + "Приложение изисква актуализирането на услугите за Google Play." + "Приложение изисква активирането на услугите за Google Play." + "Заявено от %1$s" "Изтегляне на услугите за Google Play" "Това приложение няма да се изпълнява без услугите за Google Play, които липсват в телефона ви." "Това приложение няма да се изпълнява без услугите за Google Play, които липсват в таблета ви." @@ -21,11 +26,4 @@ "Актуализиране" "Вход" "Вход с Google" - - "Приложение опита да ползва неправилна версия на услуг. за Google Play." - "Приложение изисква активирането на услугите за Google Play." - "Приложение изисква инсталирането на услугите за Google Play." - "Приложение изисква актуализирането на услугите за Google Play." - "Грешка в услугите за Google Play" - "Заявено от %1$s" diff --git a/google-play-services_lib/res/values-ca/strings.xml b/google-play-services_lib/res/values-ca/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-ca/strings.xml rename to google-play-services_lib/res/values-ca/common_strings.xml index 5b63e86..d9ebc7f 100644 --- a/google-play-services_lib/res/values-ca/strings.xml +++ b/google-play-services_lib/res/values-ca/common_strings.xml @@ -1,6 +1,11 @@ + "Error dels serveis de Google Play" + "Una aplicació requereix que s\'instal·lin els serveis de Google Play." + "Una aplicació requereix que s\'actualitzin els serveis de Google Play." + "Una aplicació requereix que s\'activin els serveis de Google Play." + "Sol·licitada per %1$s" "Baixa els serveis de Google Play" "Aquesta aplicació no s\'executarà si el telèfon no té instal·lats els serveis de Google Play." "Aquesta aplicació no funcionarà si la tauleta no té instal·lats els serveis de Google Play." @@ -21,11 +26,4 @@ "Actualitza" "Inicia sessió" "Inicia sessió amb Google" - - "Una aplic. ha intentat utilitzar una versió errònia de serveis de Play." - "Una aplicació requereix que s\'activin els serveis de Google Play." - "Una aplicació requereix que s\'instal·lin els serveis de Google Play." - "Una aplicació requereix que s\'actualitzin els serveis de Google Play." - "Error dels serveis de Google Play" - "Sol·licitada per %1$s" diff --git a/google-play-services_lib/res/values-cs/strings.xml b/google-play-services_lib/res/values-cs/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-cs/strings.xml rename to google-play-services_lib/res/values-cs/common_strings.xml index 1b5423b..669d2a2 100644 --- a/google-play-services_lib/res/values-cs/strings.xml +++ b/google-play-services_lib/res/values-cs/common_strings.xml @@ -1,6 +1,11 @@ + "Chyba služeb Google Play" + "Aplikace vyžaduje instalaci služeb Google Play." + "Aplikace vyžaduje aktualizaci služeb Google Play." + "Aplikace vyžaduje aktivaci služeb Google Play." + "Požadováno aplikací %1$s" "Instalovat služby Google Play" "Ke spuštění této aplikace jsou potřeba služby Google Play, které v telefonu nemáte." "Ke spuštění této aplikace jsou potřeba služby Google Play, které v tabletu nemáte." @@ -21,11 +26,4 @@ "Aktualizovat" "Přihlásit se" "Přihlásit se účtem Google" - - "Aplikace se pokusila použít nesprávnou verzi Služeb Google Play." - "Aplikace vyžaduje aktivované Služby Google Play." - "Aplikace vyžaduje instalaci Služeb Google Play." - "Aplikace vyžaduje aktualizaci Služeb Google Play." - "Chyba služeb Google Play" - "Požadováno aplikací %1$s" diff --git a/google-play-services_lib/res/values-da/strings.xml b/google-play-services_lib/res/values-da/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-da/strings.xml rename to google-play-services_lib/res/values-da/common_strings.xml index daa2160..79c3c64 100644 --- a/google-play-services_lib/res/values-da/strings.xml +++ b/google-play-services_lib/res/values-da/common_strings.xml @@ -1,6 +1,11 @@ + "Fejl i Google Play-tjenester" + "En applikation kræver, at Google Play-tjenester installeres." + "En applikation kræver, at Google Play-tjenester opdateres." + "En applikation kræver, at Google Play-tjenester aktiveres." + "Anmodning fra %1$s" "Hent Google Play-tjenester" "Denne app kan ikke køre uden Google Play-tjenester, som mangler på din telefon." "Denne app kan ikke køre uden Google Play-tjenester, som mangler på din tablet." @@ -21,11 +26,4 @@ "Opdater" "Log ind" "Log ind med Google" - - "En applikation forsøgte at bruge en defekt version af Google Play." - "En applikation kræver, at Google Play er aktiveret." - "En applikation kræver, at Google Play er installeret." - "En applikation kræver en opdatering af Google Play." - "Fejl i Google Play-tjenester" - "Anmodning fra %1$s" diff --git a/google-play-services_lib/res/values-de/strings.xml b/google-play-services_lib/res/values-de/common_strings.xml similarity index 79% rename from google-play-services_lib/res/values-de/strings.xml rename to google-play-services_lib/res/values-de/common_strings.xml index df8e88e..30c49d6 100644 --- a/google-play-services_lib/res/values-de/strings.xml +++ b/google-play-services_lib/res/values-de/common_strings.xml @@ -1,6 +1,11 @@ + "Fehler bei Zugriff auf Google Play-Dienste" + "App erfordert die Installation der Google Play-Dienste" + "App erfordert ein Update der Google Play-Dienste" + "App erfordert die Aktivierung der Google Play-Dienste" + "Angefordert von %1$s" "Google Play-Dienste installieren" "Zur Nutzung dieser App sind Google Play-Dienste erforderlich, die auf Ihrem Telefon nicht installiert sind." "Zur Nutzung dieser App sind Google Play-Dienste erforderlich, die auf Ihrem Tablet nicht installiert sind." @@ -21,11 +26,4 @@ "Aktualisieren" "Anmelden" "Über Google anmelden" - - "App versuchte, defekte Google Play-Dienste-Version zu verwenden" - "App erfordert aktivierte Google Play-Dienste" - "App erfordert die Installation von Google Play-Diensten" - "App erfordert ein Update für Google Play-Dienste" - "Fehler bei Google Play-Diensten" - "Angefordert von %1$s" diff --git a/google-play-services_lib/res/values-el/strings.xml b/google-play-services_lib/res/values-el/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-el/strings.xml rename to google-play-services_lib/res/values-el/common_strings.xml index 13a5dc5..0ea141e 100644 --- a/google-play-services_lib/res/values-el/strings.xml +++ b/google-play-services_lib/res/values-el/common_strings.xml @@ -1,6 +1,11 @@ + "Σφάλμα Υπηρεσιών Google Play" + "Μια εφαρμογή απαιτεί την εγκατάσταση των Υπηρεσιών Google Play." + "Μια εφαρμογή απαιτεί την ενημέρωση των Υπηρεσιών Google Play." + "Μια εφαρμογή απαιτεί την ενεργοποίηση των Υπηρεσιών Google Play." + "Υποβλήθηκε αίτημα από την εφαρμογή %1$s" "Λήψη υπηρεσιών Google Play" "Αυτή η εφαρμογή δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από το τηλέφωνό σας." "Αυτή η εφαρμογή δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από το tablet σας." @@ -21,11 +26,4 @@ "Ενημέρωση" "Σύνδεση" "Συνδεθείτε στο Google" - - "Απόπειρα χρήσης ακατάλληλης έκδοσης Υπηρεσιών Google Play από εφαρμογή" - "Μια εφαρμογή απαιτεί τις Υπηρεσίες Google Play για ενεργοποίηση." - "Μια εφαρμογή απαιτεί την εγκατάσταση των Υπηρεσιών Google Play." - "Μια εφαρμογή απαιτεί μια ενημέρωση για τις Υπηρεσίες Google Play." - "Σφάλμα υπηρεσιών Google Play" - "Υποβλήθηκε αίτημα από την εφαρμογή %1$s" diff --git a/google-play-services_lib/res/values-en-rIN/strings.xml b/google-play-services_lib/res/values-en-rGB/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-en-rIN/strings.xml rename to google-play-services_lib/res/values-en-rGB/common_strings.xml index 106d390..b32a51e 100644 --- a/google-play-services_lib/res/values-en-rIN/strings.xml +++ b/google-play-services_lib/res/values-en-rGB/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play services error" + "An application requires installation of Google Play services." + "An application requires an update for Google Play Services." + "An application requires Google Play services to be enabled." + "Requested by %1$s" "Get Google Play services" "This app won\'t run without Google Play services, which are missing from your phone." "This app won\'t run without Google Play services, which are missing from your tablet." @@ -21,11 +26,4 @@ "Update" "Sign in" "Sign in with Google" - - "An application attempted to use a bad version of Google Play Services." - "An application requires Google Play Services to be enabled." - "An application requires installation of Google Play Services." - "An application requires an update for Google Play Services." - "Google Play services error" - "Requested by %1$s" diff --git a/google-play-services_lib/res/values-en-rGB/strings.xml b/google-play-services_lib/res/values-en-rIN/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-en-rGB/strings.xml rename to google-play-services_lib/res/values-en-rIN/common_strings.xml index 106d390..b32a51e 100644 --- a/google-play-services_lib/res/values-en-rGB/strings.xml +++ b/google-play-services_lib/res/values-en-rIN/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play services error" + "An application requires installation of Google Play services." + "An application requires an update for Google Play Services." + "An application requires Google Play services to be enabled." + "Requested by %1$s" "Get Google Play services" "This app won\'t run without Google Play services, which are missing from your phone." "This app won\'t run without Google Play services, which are missing from your tablet." @@ -21,11 +26,4 @@ "Update" "Sign in" "Sign in with Google" - - "An application attempted to use a bad version of Google Play Services." - "An application requires Google Play Services to be enabled." - "An application requires installation of Google Play Services." - "An application requires an update for Google Play Services." - "Google Play services error" - "Requested by %1$s" diff --git a/google-play-services_lib/res/values-es-rUS/strings.xml b/google-play-services_lib/res/values-es-rUS/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-es-rUS/strings.xml rename to google-play-services_lib/res/values-es-rUS/common_strings.xml index 6be9059..541ea96 100644 --- a/google-play-services_lib/res/values-es-rUS/strings.xml +++ b/google-play-services_lib/res/values-es-rUS/common_strings.xml @@ -1,6 +1,11 @@ + "Error de Google Play Services" + "Una aplicación requiere que se instale Google Play Services" + "Una aplicación requiere que se actualice Google Play Services" + "Una aplicación requiere que se habilite Google Play Services" + "Solicitada por %1$s" "Obtener Google Play Services" "Esta aplicación no se ejecutará si no instalasGoogle Play Services en tu dispositivo." "Esta aplicación no se ejecutará si no instalas Google Play Services en tu tablet." @@ -21,11 +26,4 @@ "Actualizar" "Acceder" "Acceder con Google" - - "Una aplic. intentó usar una versión no válida de Google Play Services" - "Una aplicación requiere que se active Google Play Services" - "Una aplicación requiere que se instale Google Play Services" - "Una aplicación requiere que se actualice Google Play Services" - "Error de Google Play Services" - "Solicitada por %1$s" diff --git a/google-play-services_lib/res/values-es/strings.xml b/google-play-services_lib/res/values-es/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-es/strings.xml rename to google-play-services_lib/res/values-es/common_strings.xml index ed32995..a96c717 100644 --- a/google-play-services_lib/res/values-es/strings.xml +++ b/google-play-services_lib/res/values-es/common_strings.xml @@ -1,6 +1,11 @@ + "Error de servicios de Google Play" + "Una aplicación requiere la instalación de servicios de Google Play." + "Una aplicación requiere una actualización de servicios de Google Play." + "Una aplicación requiere que se habiliten los servicios de Google Play." + "Solicitada por %1$s" "Descargar servicios de Google Play" "Esta aplicación no se ejecutará si tu teléfono no tiene instalados los servicios de Google Play." "Esta aplicación no se ejecutará si tu tablet no tiene instalados los servicios de Google Play." @@ -21,11 +26,4 @@ "Actualizar" "Iniciar sesión" "Iniciar sesión con Google" - - "Una aplicación intentó usar versión incorrecta de servicios de Google Play." - "Una aplicación requiere que se habiliten los servicios de Play." - "Una aplicación requiere que se instalen los servicios de Google Play." - "Una aplicación requiere que se actualicen los servicios de Google Play." - "Error de los servicios de Google Play" - "Solicitada por %1$s" diff --git a/google-play-services_lib/res/values-es/wallet_strings.xml b/google-play-services_lib/res/values-es/wallet_strings.xml new file mode 100644 index 0000000..345f2cf --- /dev/null +++ b/google-play-services_lib/res/values-es/wallet_strings.xml @@ -0,0 +1,4 @@ + + + Comprar con Google + diff --git a/google-play-services_lib/res/values-et-rEE/strings.xml b/google-play-services_lib/res/values-et-rEE/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-et-rEE/strings.xml rename to google-play-services_lib/res/values-et-rEE/common_strings.xml index 281caff..262340f 100644 --- a/google-play-services_lib/res/values-et-rEE/strings.xml +++ b/google-play-services_lib/res/values-et-rEE/common_strings.xml @@ -1,6 +1,11 @@ + "Viga Google Play teenustes" + "Rakenduse kasutamiseks peavad olema installitud Google Play teenused." + "Rakenduse kasutamiseks tuleb värskendada Google Play teenuseid." + "Rakenduse kasutamiseks peavad olema lubatud Google Play teenused." + "Taotluse esitas %1$s" "Hankige Google Play teenused" "Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie telefonis pole." "Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie tahvelarvutis pole." @@ -21,11 +26,4 @@ "Värskenda" "Logi sisse" "Logi sisse Google\'iga" - - "Rakendus püüdis kasutada Google Play teenuste sobimatut versiooni." - "Rakenduse kasutamiseks peavad olema lubatud Google Play teenused." - "Rakenduse kasutamiseks peavad olema installitud Google Play teenused." - "Rakenduse kasutamiseks tuleb värskendada Google Play teenuseid." - "Viga Google Play teenustes" - "Päringu esitas: %1$s" diff --git a/google-play-services_lib/res/values-fa/strings.xml b/google-play-services_lib/res/values-fa/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-fa/strings.xml rename to google-play-services_lib/res/values-fa/common_strings.xml index 87e10d1..17a4e43 100644 --- a/google-play-services_lib/res/values-fa/strings.xml +++ b/google-play-services_lib/res/values-fa/common_strings.xml @@ -1,6 +1,11 @@ + "‏خطا در خدمات Google Play" + "‏برنامه‌ای نیاز به نصب خدمات Google Play دارد." + "‏‫برنامه‌ای نیاز به یک به‌روزرسانی برای خدمات Google Play دارد." + "‏برنامه‌ای نیاز به فعال شدن خدمات Google Play دارد." + "درخواست توسط %1$s" "‏دریافت خدمات Google Play" "‏این برنامه بدون خدمات Google Play اجرا نمی‌شود، این خدمات در تلفن شما وجود ندارد." "‏این برنامه بدون خدمات Google Play اجرا نمی‌شود، این خدمات در رایانهٔ لوحی شما وجود ندارد." @@ -21,11 +26,4 @@ "به‌روزرسانی" "ورود به سیستم" "‏ورود به سیستم با Google‎" - - "‏برنامه‌ای تلاش کرد از نسخه نادرستی از خدمات Google Play استفاده کند." - "‏برنامه‌ای به فعال کردن خدمات Google Play نیاز دارد." - "‏برنامه‌ای به نصب خدمات Google Play نیاز دارد." - "‏برنامه‌ای به به‌روزرسانی خدمات Google Play نیاز دارد." - "‏خطا در خدمات Google Play" - "درخواست توسط %1$s" diff --git a/google-play-services_lib/res/values-fi/strings.xml b/google-play-services_lib/res/values-fi/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-fi/strings.xml rename to google-play-services_lib/res/values-fi/common_strings.xml index 00d3ceb..ccf1a10 100644 --- a/google-play-services_lib/res/values-fi/strings.xml +++ b/google-play-services_lib/res/values-fi/common_strings.xml @@ -1,6 +1,11 @@ + "Virhe Google Play -palveluissa" + "Asenna Google Play -palvelut, jotta sovellus toimii." + "Päivitä Google Play -palvelut, jotta sovellus toimii." + "Ota käyttöön Google Play -palvelut, jotta sovellus toimii." + "Pyynnön teki %1$s" "Asenna Google Play -palvelut" "Tämä sovellus ei toimi ilman Google Play -palveluita, jotka puuttuvat puhelimesta." "Tämä sovellus ei toimi ilman Google Play -palveluita, jotka puuttuvat tablet-laitteesta." @@ -21,11 +26,4 @@ "Päivitä" "Kirjaudu" "Kirjaudu Google-tiliin" - - "Sovellus yritti käyttää virheellistä Google Play -palveluiden versiota" - "Ota käyttöön Google Play -palvelut, jotta sovellus toimii." - "Asenna Google Play -palvelut, jotta sovellus toimii." - "Päivitä Google Play -palvelut, jotta sovellus toimii." - "Virhe Google Play -palveluissa" - "Pyynnön teki %1$s" diff --git a/google-play-services_lib/res/values-fr-rCA/strings.xml b/google-play-services_lib/res/values-fr-rCA/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-fr-rCA/strings.xml rename to google-play-services_lib/res/values-fr-rCA/common_strings.xml index e915fe4..cd4150e 100644 --- a/google-play-services_lib/res/values-fr-rCA/strings.xml +++ b/google-play-services_lib/res/values-fr-rCA/common_strings.xml @@ -1,6 +1,11 @@ + "Erreur liée aux services Google Play" + "Une application demande l\'installation des services Google Play." + "Une application requiert la mise à jour des services Google Play." + "Une application requiert l\'activation des services Google Play." + "Demandée par %1$s" "Installer les services Google Play" "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre téléphone." "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre tablette." @@ -21,11 +26,4 @@ "Mettre à jour" "Connexion" "Se connecter via Google" - - "Une application requiert une version valide des services Google Play" - "Une application requiert l\'activation des services Google Play" - "Une application requiert l\'installation des services Google Play" - "Une application requiert la mise à jour des services Google Play" - "Erreur liée aux services Google Play" - "Demandée par %1$s" diff --git a/google-play-services_lib/res/values-fr/strings.xml b/google-play-services_lib/res/values-fr/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-fr/strings.xml rename to google-play-services_lib/res/values-fr/common_strings.xml index 321b283..1d62961 100644 --- a/google-play-services_lib/res/values-fr/strings.xml +++ b/google-play-services_lib/res/values-fr/common_strings.xml @@ -1,6 +1,11 @@ + "Erreur liée aux services Google Play" + "Une application demande l\'installation des services Google Play." + "Une application demande la mise à jour des services Google Play." + "Une application demande l\'activation des services Google Play." + "Notification issue de l\'application \"%1$s\"" "Installer les services Google Play" "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre téléphone." "Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre tablette." @@ -21,11 +26,4 @@ "Mettre à jour" "Connexion" "Se connecter avec Google" - - "Une application requiert une version valide des services Google Play" - "Une application requiert l\'activation des services Google Play" - "Une application requiert l\'installation des services Google Play" - "Une application requiert la mise à jour des services Google Play" - "Erreur liée aux services Google Play" - "Demandée par %1$s" diff --git a/google-play-services_lib/res/values-hi/strings.xml b/google-play-services_lib/res/values-hi/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-hi/strings.xml rename to google-play-services_lib/res/values-hi/common_strings.xml index b36feb0..66d9c54 100644 --- a/google-play-services_lib/res/values-hi/strings.xml +++ b/google-play-services_lib/res/values-hi/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play सेवाएं त्रुटि" + "एप्लिकेशन के लिए Google Play सेवाएं इंस्टॉल किए जाने की आवश्यकता है." + "एप्लिकेशन के लिए Google Play सेवाओं में नई जानकारी की आवश्यकता है." + "एप्लिकेशन के लिए Google Play सेवाएं सक्षम किए जाने की आवश्यकता है." + "%1$s के द्वारा अनुरोधित" "Google Play सेवाएं पाएं" "यह ऐप्स Google Play सेवाओं के बिना नहीं चलेगा, जो आपके फ़ोन में नहीं हैं." "यह ऐप्स Google Play सेवाओं के बिना नहीं चलेगा, जो आपके टेबलेट में नहीं हैं." @@ -21,11 +26,4 @@ "नई जानकारी पाएं" "प्रवेश करें" "Google से प्रवेश करें" - - "ऐप्स ने Google Play सेवाओं के खराब संस्करण के उपयोग का प्रयास किया." - "ऐप्स के लिए Google Play सेवाओं को सक्षम किए जाने की आवश्यकता है." - "ऐप्स के लिए Google Play सेवाओं के इंस्टॉलेशन की आवश्यकता है." - "ऐप्स के लिए Google Play सेवाओं में Google Play से नई जानकारी की आवश्यकता है." - "Google Play सेवाएं त्रुटि" - "%1$s द्वारा अनुरोधित" diff --git a/google-play-services_lib/res/values-hr/strings.xml b/google-play-services_lib/res/values-hr/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-hr/strings.xml rename to google-play-services_lib/res/values-hr/common_strings.xml index b7d462d..f8f72c7 100644 --- a/google-play-services_lib/res/values-hr/strings.xml +++ b/google-play-services_lib/res/values-hr/common_strings.xml @@ -1,6 +1,11 @@ + "Pogreška Usluga za Google Play" + "Aplikacija zahtijeva instaliranje Usluga za Google Play." + "Aplikacija zahtijeva ažuriranje Usluga za Google Play." + "Aplikacija zahtijeva da Usluge za Google Play budu omogućene." + "Zahtijeva aplikacija %1$s" "Preuzmi usluge za Google Play" "Ova aplikacija neće funkcionirati bez usluga za Google Play, koje nisu instalirane na vašem telefonu." "Ova aplikacija neće funkcionirati bez usluga za Google Play, koje nisu instalirane na vašem tabletnom računalu." @@ -21,11 +26,4 @@ "Ažuriranje" "Prijava" "Prijava uslugom Google" - - "Aplikacija je pokušala upotrijebiti lošu verziju Usluga za Google Play." - "Aplikacija zahtijeva omogućavanje Usluga za Google Play." - "Aplikacija zahtijeva instaliranje Usluga za Google Play." - "Aplikacija zahtijeva ažuriranje Usluga za Google Play." - "Pogreška usluga za Google Play" - "Zahtijeva aplikacija %1$s" diff --git a/google-play-services_lib/res/values-hu/strings.xml b/google-play-services_lib/res/values-hu/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-hu/strings.xml rename to google-play-services_lib/res/values-hu/common_strings.xml index cd15ad3..8c429e4 100644 --- a/google-play-services_lib/res/values-hu/strings.xml +++ b/google-play-services_lib/res/values-hu/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play szolgáltatások – hiba" + "Egy alkalmazás Google Play-szolgáltatások telepítését kéri." + "Egy alkalmazás Google Play-szolgáltatások frissítését kéri." + "Egy alkalmazás Google Play-szolgáltatások engedélyezését kéri." + "A(z) %1$s kérésére" "Play Szolgáltatások telepítése" "Az alkalmazás működéséhez a Google Play Szolgáltatások szükségesek, ezek nincsenek telepítve a telefonon." "Az alkalmazás működéséhez a Google Play Szolgáltatások szükségesek, ezek nincsenek telepítve a táblagépen." @@ -21,11 +26,4 @@ "Frissítés" "Belépés" "Google-bejelentkezés" - - "Egy alkalmazás a Play Szolgáltatások rossz verzióját akarta használni." - "Egy alkalmazás kéri a Google Play Szolgáltatások engedélyezését." - "Egy alkalmazás kéri a Google Play Szolgáltatások telepítését." - "Egy alkalmazás kéri a Google Play Szolgáltatások frissítését." - "Google Play szolgáltatási hiba" - "Igénylő: %1$s" diff --git a/google-play-services_lib/res/values-hy-rAM/strings.xml b/google-play-services_lib/res/values-hy-rAM/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-hy-rAM/strings.xml rename to google-play-services_lib/res/values-hy-rAM/common_strings.xml index d89be9b..ea5d130 100644 --- a/google-play-services_lib/res/values-hy-rAM/strings.xml +++ b/google-play-services_lib/res/values-hy-rAM/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play ծառայությունների սխալ կա" + "Ինչ-որ հավելված պահանջում է տեղադրել Google Play ծառայությունները:" + "Ինչ-որ հավելված պահանջում է թարմացնել Google Play ծառայությունները:" + "Ինչ-որ հավելված պահանջում է միացնել Google Play ծառայությունները:" + "%1$s-ի հարցմամբ" "Տեղադրեք Google Play ծառայությունները" "Այս հավելվածը չի գործարկվի առանց Google Play ծառայությունների, որոնք բացակայում են ձեր հեռախոսում:" "Այս հավելվածը չի գործարկվի առանց Google Play ծառայությունների, որոնք բացակայում են ձեր գրասալիկում:" @@ -21,11 +26,4 @@ "Նորացնել" "Մուտք գործել" "Մուտք գործեք Google-ով" - - "Հավելվածը փորձել է կիրառել Google Play ծառայությունների վատ տարբերակը:" - "Հավելվածը պահանջում է միացնել Google Play ծառայությունները:" - "Հավելվածը պահանջում է տեղադրել Google Play ծառայությունները:" - "Հավելվածը պահանջում է թարմացնել Google Play ծառայությունները:" - "Google Play ծառայությունների սխալ" - "%1$s-ի հարցմամբ" diff --git a/google-play-services_lib/res/values-in/strings.xml b/google-play-services_lib/res/values-in/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-in/strings.xml rename to google-play-services_lib/res/values-in/common_strings.xml index 526b84a..d13356a 100644 --- a/google-play-services_lib/res/values-in/strings.xml +++ b/google-play-services_lib/res/values-in/common_strings.xml @@ -1,6 +1,11 @@ + "Kesalahan layanan Google Play" + "Aplikasi mewajibkan pemasangan layanan Google Play." + "Aplikasi mewajibkan pembaruan untuk layanan Google Play." + "Aplikasi mewajibkan agar layanan Google Play diaktifkan." + "Diminta oleh %1$s" "Dapatkan layanan Google Play" "Aplikasi ini tidak akan berjalan tanpa layanan Google Play, yang tidak ada di ponsel Anda." "Aplikasi ini tidak akan berjalan tanpa layanan Google Play, yang tidak ada di tablet Anda." @@ -21,11 +26,4 @@ "Perbarui" "Masuk" "Masuk dengan Google" - - "Aplikasi mencoba menggunakan versi Layanan Google Play yang rusak." - "Aplikasi membutuhkan Layanan Google Play untuk dapat diaktifkan." - "Aplikasi membutuhkan pemasangan Layanan Google Play." - "Aplikasi membutuhkan pembaruan untuk Layanan Google Play." - "Kesalahan layanan Google Play" - "Diminta oleh %1$s" diff --git a/google-play-services_lib/res/values-it/strings.xml b/google-play-services_lib/res/values-it/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-it/strings.xml rename to google-play-services_lib/res/values-it/common_strings.xml index f3c9f1f..213127d 100644 --- a/google-play-services_lib/res/values-it/strings.xml +++ b/google-play-services_lib/res/values-it/common_strings.xml @@ -1,6 +1,11 @@ + "Errore Google Play Services" + "Un\'applicazione richiede l\'installazione di Google Play Services." + "Un\'applicazione richiede un aggiornamento di Google Play Services." + "Un\'applicazione richiede l\'attivazione di Google Play Services." + "Richiesta da %1$s" "Installa Google Play Services" "L\'app non funzionerà senza Google Play Services, non presente sul tuo telefono." "L\'app non funzionerà senza Google Play Services, non presente sul tuo tablet." @@ -21,11 +26,4 @@ "Aggiorna" "Accedi" "Accedi con Google" - - "Un\'app ha tentato di usare una versione non valida di Play Services." - "Un\'applicazione richiede l\'attivazione di Google Play Services." - "Un\'applicazione richiede l\'installazione di Google Play Services." - "Un\'applicazione richiede un aggiornamento di Google Play Services." - "Errore Google Play Services" - "Richiesta da %1$s" diff --git a/google-play-services_lib/res/values-iw/strings.xml b/google-play-services_lib/res/values-iw/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-iw/strings.xml rename to google-play-services_lib/res/values-iw/common_strings.xml index 7474e53..0ee6661 100644 --- a/google-play-services_lib/res/values-iw/strings.xml +++ b/google-play-services_lib/res/values-iw/common_strings.xml @@ -1,6 +1,11 @@ + "‏שגיאה בשירותי Google Play" + "‏קיימת אפליקציה המחייבת התקנה של שירותי Google Play." + "‏קיימת אפליקציה המחייבת עדכון עבור שירותי Google Play." + "‏קיימת אפליקציה המחייבת הפעלה של שירותי Google Play." + "התבקשה על ידי %1$s" "‏קבל את שירותי Google Play" "‏אפליקציה זו לא תפעל ללא שירותי Google Play, החסרים בטלפון שלך." "‏אפליקציה זו לא תפעל ללא שירותי Google Play, החסרים בטאבלט שלך." @@ -21,11 +26,4 @@ "עדכן" "היכנס" "‏היכנס באמצעות Google" - - "‏יש אפליקציה שניסתה להשתמש בגרסה שגויה של שירותי Google Play." - "‏יש אפליקציה המחייבת הפעלה של שירותי Google Play." - "‏יש אפליקציה המחייבת התקנה של שירותי Google Play." - "‏יש אפליקציה המחייבת עדכון של שירותי Google Play." - "‏שגיאה בשירותי Google Play" - "התבקשה על ידי %1$s" diff --git a/google-play-services_lib/res/values-ja/strings.xml b/google-play-services_lib/res/values-ja/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-ja/strings.xml rename to google-play-services_lib/res/values-ja/common_strings.xml index 0d8b606..d2e1c6a 100644 --- a/google-play-services_lib/res/values-ja/strings.xml +++ b/google-play-services_lib/res/values-ja/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play開発者サービスのエラー" + "アプリではGoogle Play開発者サービスをインストールする必要があります" + "アプリではGoogle Play開発者サービスを更新する必要があります" + "アプリではGoogle Play開発者サービスを有効にする必要があります" + "%1$sによるリクエスト" "Play開発者サービスの入手" "このアプリの実行にはGoogle Play開発者サービスが必要ですが、お使いの携帯端末にはインストールされていません。" "このアプリの実行にはGoogle Play開発者サービスが必要ですが、お使いのタブレットにはインストールされていません。" @@ -21,11 +26,4 @@ "更新" "ログイン" "Googleでログイン" - - "アプリはGoogle Play開発者サービスの不適切なバージョンを使用しようとしました。" - "アプリではGoogle Play開発者サービスを有効にする必要があります。" - "アプリではGoogle Play開発者サービスをインストールする必要があります。" - "アプリではGoogle Play開発者サービスをアップデートする必要があります。" - "Google Play開発者サービスのエラー" - "%1$sによるリクエスト" diff --git a/google-play-services_lib/res/values-ka-rGE/strings.xml b/google-play-services_lib/res/values-ka-rGE/common_strings.xml similarity index 79% rename from google-play-services_lib/res/values-ka-rGE/strings.xml rename to google-play-services_lib/res/values-ka-rGE/common_strings.xml index 8a2c74a..a7faf54 100644 --- a/google-play-services_lib/res/values-ka-rGE/strings.xml +++ b/google-play-services_lib/res/values-ka-rGE/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play Services-ის შეცდომა" + "აპლიკაცია საჭიროება Google Play Services-ის ინსტალაციას." + "აპლიკაცია საჭიროებს Google Play Services-ის განახლებას." + "აპლიკაცია საჭიროებს გააქტიურებულ Google Play Services." + "მომთხოვნი: %1$s" "Google Play სერვისების მიღება" "ეს აპი ვერ გაეშვება Google Play სერვისების გარეშე, რაც თქვენს ტელეფონზე ვერ იძებნება." "ეს აპი ვერ გაეშვება Google Play სერვისების გარეშე, რაც თქვენს ტელეფონზე ვერ იძებნება." @@ -21,11 +26,4 @@ "განახლება" "შესვლა" "Google-ით შესვლა" - - "აპლიკაცია შეეცადა გამოეყენებინა Google Play სერვისების არასწორი ვერსია." - "აპლიკაცია საჭიროებს გააქტიურებულ Google Play Services." - "აპლიკაცია საჭიროებს Google Play Services-ის ინსტალაციას." - "აპლიკაცია საჭიროებს Google Play Services-ის განახლებას." - "Google Play სერვისების შეცდომა" - "მომთხოვნი: %1$s" diff --git a/google-play-services_lib/res/values-km-rKH/strings.xml b/google-play-services_lib/res/values-km-rKH/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-km-rKH/strings.xml rename to google-play-services_lib/res/values-km-rKH/common_strings.xml index afebf30..b047edd 100644 --- a/google-play-services_lib/res/values-km-rKH/strings.xml +++ b/google-play-services_lib/res/values-km-rKH/common_strings.xml @@ -1,6 +1,11 @@ + "កំហុស​​សេវាកម្ម​ Google កម្សាន្ត" + "កម្មវិធី​ទាមទារ​ឲ្យ​ដំឡើង​សេវាកម្ម​ Google កម្សាន្ត។" + "កម្មវិធី​ទាមទារ​​ធ្វើ​បច្ចុប្បន្នភាព​សេវាកម្ម ​Google កម្សាន្ត។" + "កម្មវិធី​ទាមទារ​ឲ្យ​បើក​សេវាកម្ម​ Google កម្សាន្ត។" + "បាន​ស្នើ​ដោយ %1$s" "ទទួល​សេវាកម្ម​កម្សាន្ត Google" "កម្មវិធី​នេះ​នឹង​មិន​ដំណើរការ​​ទេ​បើ​គ្មាន​​សេវាកម្ម​កម្សាន្ត​ Google ដែល​ទូរស័ព្ទ​របស់​​អ្នក​មិន​មាន។" "​​កម្មវិធី​នេះ​នឹង​មិន​ដំណើរការ​​ទេ​បើ​គ្មាន​​សេវាកម្ម​កម្សាន្ត​ Google ដែល​​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​មិន​មាន។" @@ -21,11 +26,4 @@ "ធ្វើ​បច្ចុប្បន្នភាព" "ចូល" "ចូល​ដោយ​ប្រើ​ Google" - - "កម្មវិធី​​​ព្យាយាម​ប្រើ​កំណែ​មិនល្អ​របស់​សេវា​កម្ម​ឃ្លាំ​កម្មវិធី។" - "កម្មវិធី​ទាមទារ​​បើក​សេវាកម្ម​ឃ្លាំង​កម្មវិធី។" - "កម្មវិធី​ទាមទារ​ការ​ដំឡើង​សេវាកម្ម​ឃ្លាំង​កម្មវិធី។" - "កម្មវិធី​ទាមទារ​​ធ្វើ​បច្ចុប្បន្នភាព​សេវាកម្ម​ឃ្លាំង​កម្មវិធី។" - "កំហុស​សេវា​កម្ម​កម្សាន្ត Google" - "បាន​ស្នើ​ដោយ %1$s" diff --git a/google-play-services_lib/res/values-ko/strings.xml b/google-play-services_lib/res/values-ko/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-ko/strings.xml rename to google-play-services_lib/res/values-ko/common_strings.xml index e37f1fd..045c6f5 100644 --- a/google-play-services_lib/res/values-ko/strings.xml +++ b/google-play-services_lib/res/values-ko/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play 서비스 오류" + "Google Play 서비스를 설치해야 하는 애플리케이션입니다." + "Google Play 서비스를 업데이트해야 하는 애플리케이션입니다." + "Google Play 서비스를 사용 설정해야 하는 애플리케이션입니다." + "%1$s에서 요청" "Google Play 서비스 설치" "휴대전화에 Google Play 서비스가 설치되어 있어야 이 앱이 실행됩니다." "태블릿에 Google Play 서비스가 설치되어 있어야 이 앱이 실행됩니다." @@ -21,11 +26,4 @@ "업데이트" "로그인" "Google 계정으로 로그인" - - "애플리케이션에서 잘못된 버전의 Google Play 서비스를 사용하려고 했습니다." - "Google Play 서비스를 사용하도록 설정해야 하는 애플리케이션입니다." - "Google Play 서비스를 설치해야 하는 애플리케이션입니다." - "Google Play 서비스를 업데이트해야 하는 애플리케이션입니다." - "Google Play 서비스 오류" - "%1$s에서 요청" diff --git a/google-play-services_lib/res/values-lo-rLA/strings.xml b/google-play-services_lib/res/values-lo-rLA/common_strings.xml similarity index 79% rename from google-play-services_lib/res/values-lo-rLA/strings.xml rename to google-play-services_lib/res/values-lo-rLA/common_strings.xml index 32bcb0b..395cb92 100644 --- a/google-play-services_lib/res/values-lo-rLA/strings.xml +++ b/google-play-services_lib/res/values-lo-rLA/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play Services ​ເກີດ​ຄວາມ​ຜິດ​ພາດ" + "​ແອັບ​ພ​ລິ​ເຄ​ຊັນ​ຕ້ອງ​ການ​ໃຫ້​ຕິດ​ຕັ້ງ​ບໍ​ລິ​ການ Google Play ກ່ອນ." + "​ແອັບ​ພ​ລິ​ເຄ​ຊັນ​ຕ້ອງ​ການ​ໃຫ້​ອັບ​ເດດບໍ​ລິ​ການ Google Play ກ່ອນ." + "ແອັບພລິເຄຊັນຕ້ອງ​ການນຳໃຊ້ Google Play Services." + "ຮ້ອງຂໍໂດຍ %1$s" "ຕິດຕັ້ງບໍລິການ Google Play" "ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ໂດຍທີ່ບໍ່ມີບໍລິການ Google Play ເຊິ່ງຂາດຫາຍໄປໃນໂທລະສັບຂອງທ່ານ." "ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ໂດຍທີ່ບໍ່ມີບໍລິການ Google Play ເຊິ່ງຂາດຫາຍໄປໃນແທັບເລັດຂອງທ່ານ." @@ -21,11 +26,4 @@ "ອັບເດດ" "ເຂົ້າສູ່ລະບົບ" "ເຂົ້າສູ່ລະບົບດ້ວຍ Google" - - "ແອັບພລິເຄຊັນໄດ້ພະຍາຍາມໃຊ້ Google Play Services ເວີຊັນທີ່ບໍ່ສາມາດໃຊ້ໄດ້." - "ແອັບພລິເຄຊັນຕ້ອງການເປີດນຳໃຊ້ Google Play Services." - "ແອັບພລິເຄຊັນຕ້ອງການໃຫ້ຕິດຕັ້ງ Google Play Services." - "ແອັບພລິເຄຊັນຕ້ອງການອັບເດດ Google Play Services." - "ບໍລິການ Google Play ຜິດພາດ" - "ຮ້ອງຂໍໂດຍ %1$s" diff --git a/google-play-services_lib/res/values-lt/strings.xml b/google-play-services_lib/res/values-lt/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-lt/strings.xml rename to google-play-services_lib/res/values-lt/common_strings.xml index 73de5fa..593ff35 100644 --- a/google-play-services_lib/res/values-lt/strings.xml +++ b/google-play-services_lib/res/values-lt/common_strings.xml @@ -1,6 +1,11 @@ + "„Google Play“ paslaugų klaida" + "Norint naudoti programą būtina įdiegti „Google Play“ paslaugas." + "Norint naudoti programą būtina atnaujinti „Google Play“ paslaugas." + "Norint naudoti programą būtina įgalinti „Google Play“ paslaugas." + "Užklausą pateikė „%1$s“" "Gauti „Google Play“ paslaugų" "Ši programa neveiks be „Google Play“ paslaugų, kurios neįdiegtos telefone." "Ši programa neveiks be „Google Play“ paslaugų, kurios neįdiegtos planšetiniame kompiuteryje." @@ -21,11 +26,4 @@ "Atnaujinti" "Prisij." "Prisij. naud. „Google“" - - "Programa bandė naudotis netinkama „Google Play“ paslaugų versija." - "Norint naudoti programą būtina įgalinti „Google Play“ paslaugas." - "Norint naudoti programą būtina įdiegti „Google Play“ paslaugas." - "Norint naudoti programą būtina atnaujinti „Google Play“ paslaugas." - "„Google Play“ paslaugų klaida" - "Užklausą pateikė „%1$s“" diff --git a/google-play-services_lib/res/values-lv/strings.xml b/google-play-services_lib/res/values-lv/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-lv/strings.xml rename to google-play-services_lib/res/values-lv/common_strings.xml index 9e4b6ee..c0abaec 100644 --- a/google-play-services_lib/res/values-lv/strings.xml +++ b/google-play-services_lib/res/values-lv/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play pakalpojumu kļūda" + "Lai lietojumprogramma darbotos, jāinstalē Google Play pakalpojumi." + "Lai lietojumprogramma darbotos, jāatjaunina Google Play pakalpojumi." + "Lai lietojumprogramma darbotos, jāiespējo Google Play pakalpojumi." + "Pieprasījums no lietotnes %1$s" "Google Play pakalpojumu iegūšana" "Lai šī lietotne darbotos, tālrunī ir jāinstalē Google Play pakalpojumi." "Lai šī lietotne darbotos, planšetdatorā ir jāinstalē Google Play pakalpojumi." @@ -21,11 +26,4 @@ "Atjaunināt" "Pierakst." "Pierakstīties Google" - - "Lietojumpr. mēģināja izmantot nederīgu Google Play pakalp. versiju." - "Lai lietojumprogramma darbotos, ir jāiespējo Google Play pakalpojumi." - "Lai lietojumprogramma darbotos, ir jāinstalē Google Play pakalpojumi." - "Lai lietojumprogramma darbotos, jāatjaunina Google Play pakalpojumi." - "Google Play pakalpojumu kļūda" - "Pieprasījums no lietotnes %1$s" diff --git a/google-play-services_lib/res/values-mn-rMN/strings.xml b/google-play-services_lib/res/values-mn-rMN/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-mn-rMN/strings.xml rename to google-play-services_lib/res/values-mn-rMN/common_strings.xml index 1743256..bb1f101 100644 --- a/google-play-services_lib/res/values-mn-rMN/strings.xml +++ b/google-play-services_lib/res/values-mn-rMN/common_strings.xml @@ -1,6 +1,11 @@ + "Google Наадаан үйлчилгээний алдаа" + "Аппликешн Google Наадаан Үйлчилгээг суулгахыг шаардана." + "Аппликешн Google Наадаан Үйлчилгээг шинэчлэхийг шаардана." + "Аппликешн Google Наадаан Үйлчилгээг идэвхжүүлсэн байхыг шаардана." + "%1$s хүсэлт гаргасан" "Google Play үйлчилгээ авах" "Таны утсанд байхгүй байгаа Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой." "Таны таблетэд байхгүй Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой." @@ -21,11 +26,4 @@ "Шинэчлэх" "Нэвтрэх" "Google-р нэвтрэх:" - - "Аппликешн Google Play Үйлчилгээний муу хувилбарыг ашиглахыг оролдлоо." - "Аппликешн Google Play Үйлчилгээг идэвхжүүлсэн байхыг шаардана." - "Аппликешн Google Play Үйлчилгээг суулгахыг шаардана." - "Аппликешн Google Play Үйлчилгээг шинэчлэхийг шаардана." - "Google Play үйлчилгээний алдаа" - "Хүсэлт гаргасан %1$s" diff --git a/google-play-services_lib/res/values-ms-rMY/strings.xml b/google-play-services_lib/res/values-ms-rMY/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-ms-rMY/strings.xml rename to google-play-services_lib/res/values-ms-rMY/common_strings.xml index 8e8a4b9..28dec3c 100644 --- a/google-play-services_lib/res/values-ms-rMY/strings.xml +++ b/google-play-services_lib/res/values-ms-rMY/common_strings.xml @@ -1,6 +1,11 @@ + "Ralat perkhidmatan Google Play" + "Perkhidmatan Google Play perlu dipasang utk menggunakan aplikasi." + "Perkhidmatan Google Play perlu dikemas kini utk menggunakan aplikasi." + "Perkhidmatan Google Play perlu didayakan untuk menggunakan aplikasi." + "Diminta oleh %1$s" "Dapatkan perkhidmatan Google Play" "Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada telefon anda." "Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada tablet anda." @@ -21,11 +26,4 @@ "Kemas kini" "Log masuk" "Log masuk dengan Google" - - "Aplikasi cuba menggunakan versi Perkhidmatan Google Play yang rosak." - "Perkhidmatan Google Play perlu didayakan untuk menggunakan aplikasi." - "Perkhidmatan Google Play perlu dipasang untuk mengguankan aplikasi." - "Perkhidmatan Google Play perlu dikemas kini untuk menggunakan aplikasi." - "Ralat perkhidmatan Google Play" - "Diminta oleh %1$s" diff --git a/google-play-services_lib/res/values-nb/strings.xml b/google-play-services_lib/res/values-nb/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-nb/strings.xml rename to google-play-services_lib/res/values-nb/common_strings.xml index 1e16bbb..e8eb375 100644 --- a/google-play-services_lib/res/values-nb/strings.xml +++ b/google-play-services_lib/res/values-nb/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play Tjenester-feil" + "En app krever installasjon av Google Play Tjenester." + "En app krever at Google Play Tjenester oppdateres." + "En app krever Google Play Tjenester for å aktiveres." + "Forespurt av %1$s" "Installer Google Play Tjenester" "Denne appen kan ikke kjøres uten Google Play Tjenester, som ikke er installert på telefonen din." "Denne appen kan ikke kjøres uten Google Play Tjenester, som ikke er installert på nettbrettet ditt." @@ -21,11 +26,4 @@ "Oppdater" "Logg på" "Logg inn med Google" - - "En app prøvde å bruke en skadet versjon av Google Play Tjenester." - "En app krever Google Play Tjenester for å aktiveres." - "En app krever at Google Play Tjenester installeres." - "En app krever at Google Play Tjenester oppdateres." - "Google Play Tjenester-feil" - "Forespurt av %1$s" diff --git a/google-play-services_lib/res/values-nl/strings.xml b/google-play-services_lib/res/values-nl/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-nl/strings.xml rename to google-play-services_lib/res/values-nl/common_strings.xml index f38db5f..4295986 100644 --- a/google-play-services_lib/res/values-nl/strings.xml +++ b/google-play-services_lib/res/values-nl/common_strings.xml @@ -1,6 +1,11 @@ + "Fout met Google Play-services" + "Google Play-services moet zijn geïnstalleerd voor een app." + "Google Play-services moet worden bijgewerkt voor een app." + "Google Play-services moet zijn ingeschakeld voor een app." + "Aangevraagd door %1$s" "Google Play-services ophalen" "Deze app kan niet worden uitgevoerd zonder Google Play-services die ontbreken op uw telefoon." "Deze app kan niet worden uitgevoerd zonder Google Play-services die ontbreken op uw tablet." @@ -21,11 +26,4 @@ "Bijwerken" "Inloggen" "Inloggen met Google" - - "Onjuiste versie van Google Play-services wordt gebruikt." - "Google Play-services moet zijn ingeschakeld voor een applicatie." - "Google Play-services moet zijn geïnstalleerd voor een applicatie." - "Google Play-services moet worden geüpdatet voor een applicatie." - "Fout met Google Play-services" - "Aangevraagd door %1$s" diff --git a/google-play-services_lib/res/values-pl/strings.xml b/google-play-services_lib/res/values-pl/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-pl/strings.xml rename to google-play-services_lib/res/values-pl/common_strings.xml index 5eba15f..201b4b7 100644 --- a/google-play-services_lib/res/values-pl/strings.xml +++ b/google-play-services_lib/res/values-pl/common_strings.xml @@ -1,6 +1,11 @@ + "Błąd Usług Google Play" + "Aplikacja wymaga zainstalowania Usług Google Play." + "Aplikacja wymaga zaktualizowania Usług Google Play." + "Aplikacja wymaga włączenia Usług Google Play." + "Żądanie z aplikacji %1$s" "Pobierz Usługi Google Play" "Ta aplikacja nie będzie działać bez Usług Google Play, których nie masz na telefonie." "Ta aplikacja nie będzie działać bez Usług Google Play, których nie masz na tablecie." @@ -21,11 +26,4 @@ "Aktualizuj" "Zaloguj się" "Zaloguj się przez Google" - - "Aplikacja próbowała skorzystać z nieprawidłowej wersji Usług Google Play." - "Aplikacja wymaga włączenia Usług Google Play." - "Aplikacja wymaga zainstalowania Usług Google Play." - "Aplikacja wymaga aktualizacji Usług Google Play." - "Błąd usług Google Play" - "Żądanie z aplikacji %1$s" diff --git a/google-play-services_lib/res/values-pt-rBR/strings.xml b/google-play-services_lib/res/values-pt-rBR/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-pt-rBR/strings.xml rename to google-play-services_lib/res/values-pt-rBR/common_strings.xml index 6db462d..5d129fb 100644 --- a/google-play-services_lib/res/values-pt-rBR/strings.xml +++ b/google-play-services_lib/res/values-pt-rBR/common_strings.xml @@ -1,6 +1,11 @@ + "Erro do Google Play Services" + "Um aplicativo requer a instalação do Google Play Services." + "Um aplicativo requer a atualização do Google Play Services." + "Um aplicativo requer a ativação do Google Play Services." + "Solicitado por %1$s" "Instale o Google Play Services" "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu telefone." "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu tablet." @@ -21,11 +26,4 @@ "Atualizar" "Login" "Fazer login com o Google" - - "Um aplicativo tentou usar uma versão errada do Google Play Services." - "Um aplicativo requer a ativação do Google Play Services." - "Um aplicativo requer a instalação do Google Play Services." - "Um aplicativo requer a atualização do Google Play Services." - "Ocorreu um erro no Google Play Services" - "Solicitado por %1$s" diff --git a/google-play-services_lib/res/values-pt-rPT/strings.xml b/google-play-services_lib/res/values-pt-rPT/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-pt-rPT/strings.xml rename to google-play-services_lib/res/values-pt-rPT/common_strings.xml index 0ceafcb..11dc641 100644 --- a/google-play-services_lib/res/values-pt-rPT/strings.xml +++ b/google-play-services_lib/res/values-pt-rPT/common_strings.xml @@ -1,6 +1,11 @@ + "Erro dos Serviços do Google Play" + "Uma aplicação necessita da instalação dos Serviços do Google Play." + "Uma aplicação necessita da atualização dos Serviços do Google Play." + "Uma aplicação necessita da ativação dos Serviços do Google Play." + "Pedida por %1$s" "Obter serviços do Google Play" "Esta aplicação não será executada sem os serviços do Google Play, que estão em falta no seu telemóvel." "Esta aplicação não será executada sem os serviços do Google Play, que estão em falta no seu tablet." @@ -21,11 +26,4 @@ "Atualizar" "Inic. ses." "Inic. sessão com o Google" - - "Aplicação tentou utiliz. versão incorreta dos Serviços do Google Play." - "Uma aplicação necessita da ativação dos Serviços do Google Play." - "Uma aplicação necessita da instalação dos Serviços do Google Play." - "Uma aplicação necessita da atualização dos Serviços do Google Play." - "Erro dos serviços do Google Play" - "Solicitado por %1$s" diff --git a/google-play-services_lib/res/values-pt/strings.xml b/google-play-services_lib/res/values-pt/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-pt/strings.xml rename to google-play-services_lib/res/values-pt/common_strings.xml index 6db462d..5d129fb 100644 --- a/google-play-services_lib/res/values-pt/strings.xml +++ b/google-play-services_lib/res/values-pt/common_strings.xml @@ -1,6 +1,11 @@ + "Erro do Google Play Services" + "Um aplicativo requer a instalação do Google Play Services." + "Um aplicativo requer a atualização do Google Play Services." + "Um aplicativo requer a ativação do Google Play Services." + "Solicitado por %1$s" "Instale o Google Play Services" "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu telefone." "Este aplicativo não funciona sem o Google Play Services, que não está instalado em seu tablet." @@ -21,11 +26,4 @@ "Atualizar" "Login" "Fazer login com o Google" - - "Um aplicativo tentou usar uma versão errada do Google Play Services." - "Um aplicativo requer a ativação do Google Play Services." - "Um aplicativo requer a instalação do Google Play Services." - "Um aplicativo requer a atualização do Google Play Services." - "Ocorreu um erro no Google Play Services" - "Solicitado por %1$s" diff --git a/google-play-services_lib/res/values-ro/strings.xml b/google-play-services_lib/res/values-ro/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-ro/strings.xml rename to google-play-services_lib/res/values-ro/common_strings.xml index eb42896..ae3c157 100644 --- a/google-play-services_lib/res/values-ro/strings.xml +++ b/google-play-services_lib/res/values-ro/common_strings.xml @@ -1,6 +1,11 @@ + "Eroare a serviciilor Google Play" + "O aplicație necesită instalarea serviciilor Google Play." + "O aplicație necesită o actualizare pentru serviciile Google Play." + "O aplicație necesită activarea serviciilor Google Play." + "Solicitată de %1$s" "Descărcaţi Servicii Google Play" "Această aplicaţie nu poate rula fără Servicii Google Play, care lipsesc de pe telefon." "Această aplicaţie nu poate rula fără Servicii Google Play, care lipsesc de pe tabletă." @@ -21,11 +26,4 @@ "Actualizaţi" "Conectați" "Conectați-vă cu Google" - - "Aplicația a încercat să utilizeze o vers. Servicii Google Play greșită" - "O aplicație necesită activarea Serviciilor Google Play." - "O aplicație necesită instalarea Serviciilor Google Play." - "O aplicație necesită o actualizare pentru Servicii Google Play." - "Eroare Servicii Google Play" - "Solicitată de %1$s" diff --git a/google-play-services_lib/res/values-ru/strings.xml b/google-play-services_lib/res/values-ru/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-ru/strings.xml rename to google-play-services_lib/res/values-ru/common_strings.xml index c784aae..8ec20f0 100644 --- a/google-play-services_lib/res/values-ru/strings.xml +++ b/google-play-services_lib/res/values-ru/common_strings.xml @@ -1,6 +1,11 @@ + "Ошибка сервисов Google Play" + "Для работы приложения требуется установить сервисы Google Play" + "Для работы приложения требуется обновить сервисы Google Play" + "Для работы приложения требуется включить сервисы Google Play" + "Источник запроса: %1$s" "Установите Сервисы Google Play" "Для работы этого приложения требуется установить Сервисы Google Play." "Для работы этого приложения требуется установить Сервисы Google Play." @@ -21,11 +26,4 @@ "Обновить" "Войти" "Войти в аккаунт Google" - - "Версия сервисов Google Play неисправна" - "Для работы приложения требуется включить сервисы Google Play" - "Для работы приложения требуется установить сервисы Google Play" - "Для работы приложения требуется обновить сервисы Google Play" - "Ошибка сервисов Google Play" - "Запрос от приложения \"%1$s\"" diff --git a/google-play-services_lib/res/values-sk/strings.xml b/google-play-services_lib/res/values-sk/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-sk/strings.xml rename to google-play-services_lib/res/values-sk/common_strings.xml index 125d87f..fc41ae7 100644 --- a/google-play-services_lib/res/values-sk/strings.xml +++ b/google-play-services_lib/res/values-sk/common_strings.xml @@ -1,6 +1,11 @@ + "Chyba služieb Google Play" + "Aplikácia vyžaduje inštaláciu služieb Google Play." + "Aplikácia vyžaduje aktualizáciu služieb Google Play." + "Aplikácia vyžaduje povolenie služieb Google Play." + "Vyžiadané aplikáciou %1$s" "Inštalovať služby Google Play" "Na spustenie tejto aplikácie sa vyžadujú služby Google Play, ktoré v telefóne nemáte." "Na spustenie tejto aplikácie sa vyžadujú služby Google Play, ktoré v tablete nemáte." @@ -21,11 +26,4 @@ "Aktualizovať" "Prihlásiť sa" "Prihlásiť sa do účtu Google" - - "Aplikácia sa pokúsila použiť nesprávnu verziu služieb Google Play." - "Aplikácia vyžaduje povolenie služieb Google Play." - "Aplikácia vyžaduje inštaláciu služieb Google Play." - "Aplikácia vyžaduje aktualizáciu služieb Google Play." - "Chyba služieb Google Play" - "Vyžiadané aplikáciou %1$s" diff --git a/google-play-services_lib/res/values-sl/strings.xml b/google-play-services_lib/res/values-sl/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-sl/strings.xml rename to google-play-services_lib/res/values-sl/common_strings.xml index df5821f..175abd1 100644 --- a/google-play-services_lib/res/values-sl/strings.xml +++ b/google-play-services_lib/res/values-sl/common_strings.xml @@ -1,6 +1,11 @@ + "Napaka storitev Google Play" + "Za delovanje aplikacije morate namestiti storitve Google Play." + "Za delovanje aplikacije morate posodobiti storitve Google Play." + "Za delovanje aplikacije morate omogočiti storitve Google Play." + "Zahteva aplikacije %1$s" "Namestite storitve Google Play" "Ta aplikacija ne deluje brez storitev Google Play, ki jih ni v telefonu." "Ta aplikacija ne deluje brez storitev Google Play, ki jih ni v tabličnem računalniku." @@ -21,11 +26,4 @@ "Posodobi" "Prijava" "Prijavite se v Google" - - "Aplikacija je poskusila uporabiti napačno različico Storitev Google Play." - "Za delovanje aplikacije morate omogočiti Storitve Google Play." - "Za delovanje aplikacije morate namestiti Storitve Google Play." - "Za delovanje aplikacije morate posodobiti Storitve Google Play." - "Napaka storitev Google Play" - "Zahtevala aplikacija %1$s" diff --git a/google-play-services_lib/res/values-sr/strings.xml b/google-play-services_lib/res/values-sr/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-sr/strings.xml rename to google-play-services_lib/res/values-sr/common_strings.xml index ad0b549..db89318 100644 --- a/google-play-services_lib/res/values-sr/strings.xml +++ b/google-play-services_lib/res/values-sr/common_strings.xml @@ -1,6 +1,11 @@ + "Грешка Google Play услуга" + "Апликација захтева инсталацију Google Play услуга." + "Апликација захтева ажурирање Google Play услуга." + "Апликација захтева да Google Play услуге буду омогућене." + "Захтева %1$s" "Преузимање Google Play услуга" "Ова апликација не може да се покрене без Google Play услуга, које недостају на телефону." "Ова апликација не може да се покрене без Google Play услуга, које недостају на таблету." @@ -21,11 +26,4 @@ "Ажурирај" "Пријави ме" "Пријави ме преко Google-а" - - "Апликација је покушала да користи лошу верзију Google Play услуга." - "Апликација захтева да Google Play услуге буду омогућене." - "Апликација захтева инсталирање Google Play услуга." - "Апликација захтева ажурирање Google Play услуга." - "Грешка Google Play услуга" - "Захтева %1$s" diff --git a/google-play-services_lib/res/values-sv/strings.xml b/google-play-services_lib/res/values-sv/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-sv/strings.xml rename to google-play-services_lib/res/values-sv/common_strings.xml index 6a10395..5092a5d 100644 --- a/google-play-services_lib/res/values-sv/strings.xml +++ b/google-play-services_lib/res/values-sv/common_strings.xml @@ -1,6 +1,11 @@ + "Fel på Google Play-tjänster" + "Google Play-tjänster måste installeras för att en app ska fungera." + "Google Play-tjänster måste uppdateras för en app ska fungera." + "Google Play-tjänster måste aktiveras för att en app ska fungera." + "Begärdes av %1$s" "Hämta Google Play Tjänster" "Den här appen kan inte köras utan Google Play Tjänster, som saknas på mobilen." "Den här appen kan inte köras utan Google Play Tjänster, som saknas på surfplattan." @@ -21,11 +26,4 @@ "Uppdatera" "Logga in" "Logga in med Google" - - "En olämplig version av Google Play Tjänster anropades av en app." - "Google Play Tjänster måste aktiveras för en att app ska fungera." - "Google Play Tjänster måste installeras för att en app ska fungera." - "Google Play Tjänster måste uppdateras för en app ska fungera." - "Fel på Google Play Tjänster" - "Begärdes av %1$s" diff --git a/google-play-services_lib/res/values-sw/strings.xml b/google-play-services_lib/res/values-sw/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-sw/strings.xml rename to google-play-services_lib/res/values-sw/common_strings.xml index 7f29bf5..9fc6808 100644 --- a/google-play-services_lib/res/values-sw/strings.xml +++ b/google-play-services_lib/res/values-sw/common_strings.xml @@ -1,6 +1,11 @@ + "Hitilafu kwenye huduma za Google Play" + "Programu inahitaji usakinishaji wa huduma za Google Play." + "Programu inahitaji toleo jipya la huduma za Google Play." + "Programu inahitaji huduma za Google Play ili iwashwe." + "Imeombwa na %1$s" "Pata huduma za Google Play" "Programu hii haiwezi kuendeshwa bila huduma za Google Play, ambazo hazipo kwenye simu yako." "Programu hii haiwezi kufanya kazi bila huduma za Google Play, ambazo hazipatikani kwenye kompyuta kibao yako." @@ -21,11 +26,4 @@ "Sasisha" "Ingia" "Ingia ukitumia Google" - - "Programu ilijaribu kutumia toleo baya la Huduma za Google Play." - "Programu inahitaji Huduma za Google Play ili kuwashwa." - "Programu inahitaji usakinishaji wa Huduma za Google Play." - "Programu inahitaji sasisho la Huduma za Google Play." - "Hitilafu kwenye Huduma za Google Play" - "Imeombwa na %1$s" diff --git a/google-play-services_lib/res/values-th/strings.xml b/google-play-services_lib/res/values-th/common_strings.xml similarity index 76% rename from google-play-services_lib/res/values-th/strings.xml rename to google-play-services_lib/res/values-th/common_strings.xml index 6f098fe..06ab727 100644 --- a/google-play-services_lib/res/values-th/strings.xml +++ b/google-play-services_lib/res/values-th/common_strings.xml @@ -1,6 +1,11 @@ + "ข้อผิดพลาดของบริการ Google Play" + "แอปพลิเคชันหนึ่งจำเป็นต้องมีการติดตั้งบริการ Google Play" + "แอปพลิเคชันหนึ่งจำเป็นต้องมีการอัปเดตสำหรับบริการ Google Play" + "แอปพลิเคชันหนึ่งจำเป็นต้องมีบริการ Google Play เพื่อเปิดใช้งาน" + "ขอโดย %1$s" "รับบริการ Google Play" "แอปพลิเคชันนี้จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งไม่มีในโทรศัพท์ของคุณ" "แอปพลิเคชันนี้จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งไม่มีในแท็บเล็ตของคุณ" @@ -21,11 +26,4 @@ "อัปเดต" "ลงชื่อใช้" "ลงชื่อเข้าใช้ด้วย Google" - - "แอปพลิเคชันหนึ่งพยายามใช้เวอร์ชันที่ไม่เหมาะสมของบริการ Google Play" - "แอปพลิเคชันหนึ่งจำเป็นต้องมีบริการ Google Play เพื่อเปิดใช้งาน" - "แอปพลิเคชันหนึ่งจำเป็นต้องมีการติดตั้งบริการ Google Play" - "แอปพลิเคชันหนึ่งจำเป็นต้องมีการอัปเดตสำหรับบริการ Google Play" - "ข้อผิดพลาดของบริการ Google Play" - "ขอโดย %1$s" diff --git a/google-play-services_lib/res/values-tl/strings.xml b/google-play-services_lib/res/values-tl/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-tl/strings.xml rename to google-play-services_lib/res/values-tl/common_strings.xml index 337f73c..be5c90e 100644 --- a/google-play-services_lib/res/values-tl/strings.xml +++ b/google-play-services_lib/res/values-tl/common_strings.xml @@ -1,6 +1,11 @@ + "Error sa Mga Serbisyo ng Google Play" + "Kailangan ng application na i-install ang Mga Serbisyo ng Google Play." + "Kailangan ng application ng update sa Mga Serbisyo ng Google Play." + "Kailangan ng application na na-enable ang Mga Serbisyo ng Google Play." + "Hiniling ng %1$s" "Kumuha ng mga serbisyo ng Google Play" "Hindi tatakbo ang app na ito nang wala ang mga serbisyo ng Google Play, na wala sa iyong telepono." "Hindi gagana ang app na ito nang wala ang mga serbisyo ng Google Play, na wala sa iyong tablet." @@ -21,11 +26,4 @@ "I-update" "Sign in" "Mag-sign in sa Google" - - "May app na sumubok ng maling bersyon ng Mga Serbisyo ng Google Play." - "Kailangan ng application na na-enable ang Mga Serbisyo ng Google Play." - "Kailangan ng application na ma-install ang Serbisyo ng Google Play." - "Kailangan ng application na i-update ang Mga Serbisyo ng Google Play." - "Error sa mga serbisyo ng Google Play" - "Hiniling ng %1$s" diff --git a/google-play-services_lib/res/values-tr/strings.xml b/google-play-services_lib/res/values-tr/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-tr/strings.xml rename to google-play-services_lib/res/values-tr/common_strings.xml index 17e61e5..b17e5f4 100644 --- a/google-play-services_lib/res/values-tr/strings.xml +++ b/google-play-services_lib/res/values-tr/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play Hizmetleri hatası" + "Bir uygulama, Google Play hizmetlerinin yüklenmesini gerektiriyor." + "Bir uygulama, Google Play Hizmetleri için bir güncelleme gerektiriyor." + "Bir uygulama, Google Play Hizmetleri\'nin etkin olmasını gerektiriyor." + "İstekte bulunan: %1$s" "Google Play hizmetlerini edinin" "Google Play Hizmetleri telefonunuzda yok ve bu uygulama Google Play Hizmetleri olmadan çalışmaz." "Google Play Hizmetleri tabletinizde yok ve bu uygulama Google Play Hizmetleri olmadan çalışmaz." @@ -21,11 +26,4 @@ "Güncelle" "Oturum aç" "Google\'da oturum aç" - - "Bir uygulama, Google Play Hizmetleri\'nin bozuk bir sürümünü kullanmayı denedi." - "Bir uygulama, Google Play Hizmetleri\'nin etkin olmasını gerektiriyor." - "Bir uygulama, Google Play Hizmetleri\'nin yüklenmesini gerektiriyor." - "Bir uygulama, Google Play Hizmetleri için bir güncelleme gerektiriyor." - "Google Play hizmetleri hatası" - "İstekte bulunan: %1$s" diff --git a/google-play-services_lib/res/values-uk/strings.xml b/google-play-services_lib/res/values-uk/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-uk/strings.xml rename to google-play-services_lib/res/values-uk/common_strings.xml index d657aea..a5f46b2 100644 --- a/google-play-services_lib/res/values-uk/strings.xml +++ b/google-play-services_lib/res/values-uk/common_strings.xml @@ -1,6 +1,11 @@ + "Помилка сервісів Google Play" + "Щоб додаток працював, потрібно встановити сервіси Google Play." + "Щоб додаток працював, потрібно оновити сервіси Google Play." + "Щоб додаток працював, потрібно ввімкнути сервіси Google Play." + "Запит від додатка %1$s" "Установити Google Play Послуги" "Ця програма не запуститься без Google Play Послуг, яких немає у вашому телефоні." "Ця програма не запуститься без Google Play Послуг, яких немає на вашому планшетному ПК." @@ -21,11 +26,4 @@ "Оновити" "Увійти" "Увійти в обл.запис Google" - - "Програма спробувала застосувати хибну версію Сервісів Google Play." - "Щоб програма працювала, потрібно ввімкнути Сервіси Google Play." - "Щоб програма працювала, потрібно встановити Сервіси Google Play." - "Щоб програма працювала, потрібно оновити Сервіси Google Play." - "Помилка Сервісів Google Play" - "Запит від програми %1$s" diff --git a/google-play-services_lib/res/values-vi/strings.xml b/google-play-services_lib/res/values-vi/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-vi/strings.xml rename to google-play-services_lib/res/values-vi/common_strings.xml index a0434a0..cf431d3 100644 --- a/google-play-services_lib/res/values-vi/strings.xml +++ b/google-play-services_lib/res/values-vi/common_strings.xml @@ -1,6 +1,11 @@ + "Lỗi dịch vụ của Google Play" + "Một ứng dụng yêu cầu cài đặt các dịch vụ của Google Play." + "Một ứng dụng yêu cầu cập nhật đối với các dịch vụ của Google Play." + "Một ứng dụng yêu cầu bật các dịch vụ của Google Play." + "Được yêu cầu bởi %1$s" "Cài đặt dịch vụ của Google Play" "Ứng dụng này sẽ không chạy nếu không có dịch vụ của Google Play. Điện thoại của bạn bị thiếu dịch vụ này." "Ứng dụng này sẽ không chạy nếu không có dịch vụ của Google Play. Máy tính bảng của bạn bị thiếu dịch vụ này." @@ -21,11 +26,4 @@ "Cập nhật" "Đăng nhập" "Đăng nhập bằng Google" - - "Ứng dụng đã cố sử dụng phiên bản không đúng của Dịch vụ của Google Play." - "Ứng dụng yêu cầu Dịch vụ của Google Play phải được bật." - "Ứng dụng yêu cầu cài đặt Dịch vụ của Google Play." - "Ứng dụng yêu cầu cập nhật dành cho Dịch vụ Google Play." - "Lỗi dịch vụ của Google Play" - "Được yêu cầu bởi %1$s" diff --git a/google-play-services_lib/res/values-zh-rCN/strings.xml b/google-play-services_lib/res/values-zh-rCN/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-zh-rCN/strings.xml rename to google-play-services_lib/res/values-zh-rCN/common_strings.xml index 4339e3e..40161bf 100644 --- a/google-play-services_lib/res/values-zh-rCN/strings.xml +++ b/google-play-services_lib/res/values-zh-rCN/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play服务出错" + "安装Google Play服务后才能运行应用。" + "更新Google Play服务后才能运行应用。" + "启用Google Play服务后才能运行应用。" + "由“%1$s”发出" "获取 Google Play 服务" "您的手机中没有 Google Play 服务，您必须先安装该服务才能运行此应用。" "您的平板电脑中没有 Google Play 服务，您必须先安装该服务才能运行此应用。" @@ -21,11 +26,4 @@ "更新" "登录" "使用 Google 帐户登录" - - "某个应用尝试使用的 Google Play 服务版本有误。" - "某个应用要求启用 Google Play 服务。" - "某个应用要求安装 Google Play 服务。" - "某个应用要求更新 Google Play 服务。" - "Google Play 服务出错" - "由“%1$s”发出" diff --git a/google-play-services_lib/res/values-zh-rHK/strings.xml b/google-play-services_lib/res/values-zh-rHK/common_strings.xml similarity index 77% rename from google-play-services_lib/res/values-zh-rHK/strings.xml rename to google-play-services_lib/res/values-zh-rHK/common_strings.xml index abe6cf1..e28f2e1 100644 --- a/google-play-services_lib/res/values-zh-rHK/strings.xml +++ b/google-play-services_lib/res/values-zh-rHK/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play 服務錯誤" + "必須安裝「Google Play 服務」，才能使用應用程式。" + "必須更新「Google Play 服務」，才能使用應用程式。" + "必須啟用「Google Play 服務」，才能使用應用程式。" + "「%1$s」提出要求" "取得 Google Play 服務" "您的手機未安裝 Google Play 服務，安裝後才能執行這個應用程式。" "您的平板電腦未安裝 Google Play 服務，安裝後才能執行這個應用程式。" @@ -21,11 +26,4 @@ "更新" "登入" "登入 Google" - - "應用程式嘗試使用錯誤版本的「Google Play 服務」。" - "必須啟用「Google Play 服務」，才能使用應用程式。" - "必須安裝「Google Play 服務」，才能使用應用程式。" - "必須更新「Google Play 服務」，才能使用應用程式。" - "Google Play 服務錯誤" - "「%1$s」提出要求" diff --git a/google-play-services_lib/res/values-zh-rTW/strings.xml b/google-play-services_lib/res/values-zh-rTW/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-zh-rTW/strings.xml rename to google-play-services_lib/res/values-zh-rTW/common_strings.xml index a66018a..0990b71 100644 --- a/google-play-services_lib/res/values-zh-rTW/strings.xml +++ b/google-play-services_lib/res/values-zh-rTW/common_strings.xml @@ -1,6 +1,11 @@ + "Google Play 服務發生錯誤" + "應用程式要求安裝 Google Play 服務。" + "應用程式要求更新 Google Play 服務。" + "應用程式要求啟用 Google Play 服務。" + "「%1$s」提出要求" "取得 Google Play 服務" "您的手機並未安裝 Google Play 服務，所以無法執行這個應用程式。" "您的平板電腦並未安裝 Google Play 服務，所以無法執行這個應用程式。" @@ -21,11 +26,4 @@ "更新" "登入" "使用 Google 帳戶登入" - - "應用程式嘗試使用的 Google Play 服務版本有誤。" - "應用程式需要啟用 Google Play 服務。" - "應用程式需要安裝 Google Play 服務。" - "應用程式需要更新 Google Play 服務。" - "Google Play 服務錯誤" - "提出要求的應用程式：%1$s" diff --git a/google-play-services_lib/res/values-zu/strings.xml b/google-play-services_lib/res/values-zu/common_strings.xml similarity index 78% rename from google-play-services_lib/res/values-zu/strings.xml rename to google-play-services_lib/res/values-zu/common_strings.xml index 572d9a5..1e39af2 100644 --- a/google-play-services_lib/res/values-zu/strings.xml +++ b/google-play-services_lib/res/values-zu/common_strings.xml @@ -1,6 +1,11 @@ + "Iphutha lamasevisi we-Google Play" + "Uhlelo lokusebenza ludinga ukufakwa kwamasevisi we-Google Play." + "Uhlelo lokusebenza ludinga isibuyekezo samasevisi we-Google Play." + "Uhlelo lokusebenza ludinga amasevisi we-Google Play ukuze anikwe amandla." + "Icelwe yi-%1$s" "Thola amasevisi e-Google Play" "Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kwamasevisi e-Google Play, angekho efonini yakho." "Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kwamasevisi e-Google Play, angekho kuthebulethi yakho." @@ -21,11 +26,4 @@ "Isibuyekezo" "Ngena ngemvume" "Ngena ngemvume nge-Google" - - "Uhlelo lokusebenza luzame ukusebenzisa inguqulo embi yamasevisi we-Google Play." - "Uhlelo lokusebenza ludinga amasevisi we-Google Play ukuze anikwe amandla." - "Uhlelo lokusebenza ludinga ukufakwa kwamasevisi we-Google Play." - "Uhlelo lokusebenza ludinga isibuyekezo samasevisi we-Google Play." - "Iphutha lamasevisi we-Google Play" - "Kucelwe yi-%1$s" diff --git a/google-play-services_lib/res/values/ads_attrs.xml b/google-play-services_lib/res/values/admob_ads_attrs.xml similarity index 100% rename from google-play-services_lib/res/values/ads_attrs.xml rename to google-play-services_lib/res/values/admob_ads_attrs.xml diff --git a/google-play-services_lib/res/values/admob_iap_style.xml b/google-play-services_lib/res/values/admob_iap_style.xml new file mode 100644 index 0000000..35b09a9 --- /dev/null +++ b/google-play-services_lib/res/values/admob_iap_style.xml @@ -0,0 +1,11 @@ + + + + diff --git a/google-play-services_lib/res/values/colors.xml b/google-play-services_lib/res/values/common_colors.xml similarity index 100% rename from google-play-services_lib/res/values/colors.xml rename to google-play-services_lib/res/values/common_colors.xml diff --git a/google-play-services_lib/res/values/strings.xml b/google-play-services_lib/res/values/common_strings.xml similarity index 74% rename from google-play-services_lib/res/values/strings.xml rename to google-play-services_lib/res/values/common_strings.xml index 3e8731e..5d50483 100644 --- a/google-play-services_lib/res/values/strings.xml +++ b/google-play-services_lib/res/values/common_strings.xml @@ -1,6 +1,21 @@ + + Google Play services error + + An application requires installation of Google Play services. + + An application requires an update for Google Play services. + + An application requires Google Play services to be enabled. + + + Requested by %1$s + Get Google Play services @@ -72,40 +87,4 @@ Sign in with Google - - - - - An application attempted to use a bad version of Google Play Services. - - - - An application requires Google Play Services to be enabled. - - - - An application requires installation of Google Play Services. - - - - An application requires an update for Google Play Services. - - - - Google Play services error - - - Requested by %1$s - - - - - Powered by Google - - diff --git a/google-play-services_lib/res/values/version.xml b/google-play-services_lib/res/values/version.xml index 1e7fd4e..0b7a4ed 100644 --- a/google-play-services_lib/res/values/version.xml +++ b/google-play-services_lib/res/values/version.xml @@ -1,4 +1,4 @@ - 4323000 - + 5089000 + \ No newline at end of file diff --git a/google-play-services_lib/res/values/wallet_attrs.xml b/google-play-services_lib/res/values/wallet_attrs.xml new file mode 100644 index 0000000..6a40575 --- /dev/null +++ b/google-play-services_lib/res/values/wallet_attrs.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/google-play-services_lib/res/values/wallet_colors.xml b/google-play-services_lib/res/values/wallet_colors.xml new file mode 100644 index 0000000..7432875 --- /dev/null +++ b/google-play-services_lib/res/values/wallet_colors.xml @@ -0,0 +1,21 @@ + + + + + #fff3f3f3 + #bebebe + #80bebebe + #323232 + #80323232 + #ffb2b2b2 + #ff000000 + #808080 + #808080 + #6633b5e5 + #6633b5e5 + #ff33b5e5 + #0000ee + diff --git a/google-play-services_lib/res/values/wallet_strings.xml b/google-play-services_lib/res/values/wallet_strings.xml new file mode 100644 index 0000000..8dc227b --- /dev/null +++ b/google-play-services_lib/res/values/wallet_strings.xml @@ -0,0 +1,11 @@ + + + + + + Buy with Google + + diff --git a/google-play-services_lib/res/values/wallet_styles.xml b/google-play-services_lib/res/values/wallet_styles.xml new file mode 100644 index 0000000..129e26d --- /dev/null +++ b/google-play-services_lib/res/values/wallet_styles.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + diff --git a/images/README.txt b/images/README.txt index 6458c0a..6defa5e 100644 --- a/images/README.txt +++ b/images/README.txt @@ -15,4 +15,4 @@ If a better "Shuttles" icon is desired, edit as you please and then: http://android-ui-utils.googlecode.com/hg/asset-studio/dist/icons-actionbar.html to create the ActionBar icons. -smlogo1.xcf, play_store_promo.jpg (C) 2014 Peter Piech. All rights reserved. \ No newline at end of file +smlogo1.xcf, play_store_promo.jpg, feature_graphic.jpg (C) 2014 Peter Piech. All rights reserved. \ No newline at end of file diff --git a/images/feature_graphic.jpg b/images/feature_graphic.jpg new file mode 100644 index 0000000..ff55eb6 Binary files /dev/null and b/images/feature_graphic.jpg differ