mirror of
				https://github.com/commons-app/apps-android-commons.git
				synced 2025-10-31 14:53:59 +01:00 
			
		
		
		
	Merge branch 'commons-app:main' into main
This commit is contained in:
		
						commit
						2556eda777
					
				
					 2 changed files with 6 additions and 3 deletions
				
			
		|  | @ -13,7 +13,9 @@ | ||||||
|     android:maxSdkVersion="29"/> |     android:maxSdkVersion="29"/> | ||||||
|   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> |   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> | ||||||
|   <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> |   <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> | ||||||
|   <uses-permission android:name="android.permission.GET_ACCOUNTS" /> |   <!-- Permission needed up to Android 5.1, see https://github.com/commons-app/apps-android-commons/pull/5863 --> | ||||||
|  |   <uses-permission android:name="android.permission.GET_ACCOUNTS" | ||||||
|  |     android:maxSdkVersion="22"/> | ||||||
|   <uses-permission android:name="android.permission.USE_CREDENTIALS" /> |   <uses-permission android:name="android.permission.USE_CREDENTIALS" /> | ||||||
|   <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> |   <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> | ||||||
|   <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> |   <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> | ||||||
|  |  | ||||||
|  | @ -149,8 +149,8 @@ | ||||||
|   <string name="media_detail_coordinates_empty">ਕੋਈ ਉਪਲਬਧ ਨਹੀਂ</string> |   <string name="media_detail_coordinates_empty">ਕੋਈ ਉਪਲਬਧ ਨਹੀਂ</string> | ||||||
|   <string name="_2fa_code">2FA ਕੋਡ</string> |   <string name="_2fa_code">2FA ਕੋਡ</string> | ||||||
|   <string name="logout_verification">ਕੀ ਤੁਸੀਂ ਸੱਚੀਂ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string> |   <string name="logout_verification">ਕੀ ਤੁਸੀਂ ਸੱਚੀਂ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string> | ||||||
|   <string name="welcome_image_welcome_wikipedia">ਵਿਕੀਪੀਡੀਆ \'ਤੇ ਸੁਆਗਤ</string> |   <string name="welcome_image_welcome_wikipedia">ਵਿਕੀਪੀਡੀਆ \'ਤੇ ਜੀ ਆਇਆਂ ਨੂੰ</string> | ||||||
|   <string name="welcome_image_welcome_copyright">ਕਾਪੀਰਾਈਟ ਸੁਆਗਤ</string> |   <string name="welcome_image_welcome_copyright">ਜੀ ਆਇਆਂ ਨੂੰ ਕਾਪੀਰਾਈਟ</string> | ||||||
|   <string name="cancel">ਰੱਦ ਕਰੋ</string> |   <string name="cancel">ਰੱਦ ਕਰੋ</string> | ||||||
|   <string name="navigation_drawer_open">ਖੋਲ੍ਹੋ</string> |   <string name="navigation_drawer_open">ਖੋਲ੍ਹੋ</string> | ||||||
|   <string name="navigation_drawer_close">ਬੰਦ ਕਰੋ</string> |   <string name="navigation_drawer_close">ਬੰਦ ਕਰੋ</string> | ||||||
|  | @ -179,6 +179,7 @@ | ||||||
|   <string name="menu_search_button">ਲੱਭੋ</string> |   <string name="menu_search_button">ਲੱਭੋ</string> | ||||||
|   <string name="title_activity_search">ਲੱਭੋ</string> |   <string name="title_activity_search">ਲੱਭੋ</string> | ||||||
|   <string name="search_recent_header">ਹਾਲੀਆ ਖੋਜਾਂ:</string> |   <string name="search_recent_header">ਹਾਲੀਆ ਖੋਜਾਂ:</string> | ||||||
|  |   <string name="provider_searches">ਹਾਲ ਦੀਆਂ ਪੁੱਛਗਿੱਛ ਖੋਜਾਂ</string> | ||||||
|   <string name="provider_recent_languages">ਹਾਲ ਹੀ ਵਿੱਚ ਬੋਲੀਆਂ ਬਾਰੇ ਪੁੱਛਗਿੱਛ</string> |   <string name="provider_recent_languages">ਹਾਲ ਹੀ ਵਿੱਚ ਬੋਲੀਆਂ ਬਾਰੇ ਪੁੱਛਗਿੱਛ</string> | ||||||
|   <string name="search_tab_title_categories">ਸ਼੍ਰੇਣੀਆਂ</string> |   <string name="search_tab_title_categories">ਸ਼੍ਰੇਣੀਆਂ</string> | ||||||
|   <string name="explore_tab_title_map">ਨਕਸ਼ਾ</string> |   <string name="explore_tab_title_map">ਨਕਸ਼ਾ</string> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 LachlanMajor
						LachlanMajor