Adam Jones 
								
							 
						 
						
							
							
							
							
								
							
							
								ba222e147d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'  
							
							... 
							
							
							
							Conflicts:
	commons/res/values-br/strings.xml
	commons/res/values-ca/strings.xml
	commons/res/values-cs/strings.xml
	commons/res/values-cy/strings.xml
	commons/res/values-da/strings.xml
	commons/res/values-de/strings.xml
	commons/res/values-el/strings.xml
	commons/res/values-es/strings.xml
	commons/res/values-fi/strings.xml
	commons/res/values-fo/strings.xml
	commons/res/values-fr/strings.xml
	commons/res/values-gl/strings.xml
	commons/res/values-id/strings.xml
	commons/res/values-it/strings.xml
	commons/res/values-ja/strings.xml
	commons/res/values-ka/strings.xml
	commons/res/values-km/strings.xml
	commons/res/values-ko/strings.xml
	commons/res/values-ky/strings.xml
	commons/res/values-la/strings.xml
	commons/res/values-lb/strings.xml
	commons/res/values-mk/strings.xml
	commons/res/values-ml/strings.xml
	commons/res/values-ms/strings.xml
	commons/res/values-mt/strings.xml
	commons/res/values-nb/strings.xml
	commons/res/values-ne/strings.xml
	commons/res/values-nl/strings.xml
	commons/res/values-oc/strings.xml
	commons/res/values-or/strings.xml
	commons/res/values-pa/strings.xml
	commons/res/values-pl/strings.xml
	commons/res/values-pt-rBR/strings.xml
	commons/res/values-pt/strings.xml
	commons/res/values-qq/strings.xml
	commons/res/values-ro/strings.xml
	commons/res/values-ru/strings.xml
	commons/res/values-sk/strings.xml
	commons/res/values-su/strings.xml
	commons/res/values-sv/strings.xml
	commons/res/values-te/strings.xml
	commons/res/values-tr/strings.xml
	commons/res/values-uk/strings.xml
	commons/res/values-vi/strings.xml
	commons/res/values-yi/strings.xml
	commons/res/values-zh-rCN/strings.xml
	commons/res/values-zh-rTW/strings.xml
	commons/res/values-zh/strings.xml
	commons/res/values/strings.xml 
							
						 
						
							2016-06-06 07:29:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Jones 
								
							 
						 
						
							
							
							
							
								
							
							
								43fd09827c 
								
							 
						 
						
							
							
								
								Fix translations  
							
							... 
							
							
							
							Change from some using \u00A0 to represent space, no longer required. Also fixed some malformed translations which missed out the backslash so they were just messed up (see bug #42 ) 
							
						 
						
							2016-06-03 21:50:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Jones 
								
							 
						 
						
							
							
							
							
								
							
							
								2230921780 
								
							 
						 
						
							
							
								
								Gradle test  
							
							
							
						 
						
							2016-06-02 16:18:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Jones 
								
							 
						 
						
							
							
							
							
								
							
							
								d95bab800c 
								
							 
						 
						
							
							
								
								Remove text advising to skip categories  
							
							
							
						 
						
							2016-05-31 21:28:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nicolas Raoul 
								
							 
						 
						
							
							
							
							
								
							
							
								79dddb9cb3 
								
							 
						 
						
							
							
								
								Fixed percentage syntax, see  http://stackoverflow.com/questions/4414389/android-xml-percent-symbol  
							
							
							
						 
						
							2015-09-07 14:34:30 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								4a9f590d98 
								
							 
						 
						
							
							
								
								Localisation updates from  https://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: Ida2daae33152a57c2a533186202cb5dd518edd06 
							
						 
						
							2014-10-06 11:38:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								81e3e064ab 
								
							 
						 
						
							
							
								
								Localisation updates from  https://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I0d190f6b7405000572fea2b3bfdd835b6e8c7e8b 
							
						 
						
							2014-08-06 16:49:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								f47e16f689 
								
							 
						 
						
							
							
								
								Localisation updates from  https://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I15c5da19c96a37d790563a611e748ddb9699f6a4 
							
						 
						
							2014-02-02 12:35:15 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								b3a3c974b2 
								
							 
						 
						
							
							
								
								Localisation updates from  https://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I4f467f173168a14ca6206df6d05347b677edcc31 
							
						 
						
							2014-01-06 11:00:29 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								99ec897e41 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: Iae3455ce271b8b9151f0fc63d7178be6cdbe8f94 
							
						 
						
							2013-10-27 19:16:39 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuviPanda 
								
							 
						 
						
							
							
							
							
								
							
							
								da8db5a2ca 
								
							 
						 
						
							
							
								
								Add refresh button only for Campaigns  
							
							... 
							
							
							
							Temp. hack to let people see new images when they come through
Change-Id: I986bc274ccebd53fef75dbaeffcdff891a4f77bf 
							
						 
						
							2013-10-23 20:07:07 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuviPanda 
								
							 
						 
						
							
							
							
							
								
							
							
								1bc0b781d1 
								
							 
						 
						
							
							
								
								Fix which menu items get displayed at which state  
							
							... 
							
							
							
							Only show actions that are applicable to each state.
Also clarify that 'abort' actually only 'deleted' failed
uploads. We have no way to abort an in-progress upload yet
Change-Id: I2c18273e603e3ca6b1e03f83b7404e96b6d8bad0 
							
						 
						
							2013-10-16 02:13:54 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								b7c1f44d1e 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I525dda76b79e20e1c82a7411ad9b2cee2f526612 
							
						 
						
							2013-10-14 08:52:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								0055c74756 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: Id611e0609d6f0e84693b6ade7ec660f012e625f8 
							
						 
						
							2013-09-09 18:49:26 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								a12434ad2b 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: Ib7d9801c2dbbfc998e41e3e24b181227188464c8 
							
						 
						
							2013-09-02 18:54:11 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brion Vibber 
								
							 
						 
						
							
							
							
							
								
							
							
								4df8ec8fa9 
								
							 
						 
						
							
							
								
								Media detail page redone as a "slide-up" panel.  
							
							... 
							
							
							
							Loads and displays default or English description, and categories.
No caching of this info yet.
Scrollable pane is a ListView, with the title/desc/category label
in a 'header' view along with a spacer view. The height of the spacer
is set dynamically to the height of the total fragment minus 48dp,
giving room for an initially-visible title section and a little
spillover so you can see it's scrollable.
Clicking on a category in the cats list opens the category page in
an external web browser. In the future this should open the category
within the app, but we don't have a per-cat view yet.
Description and category list are not yet editable.
GitHub: https://github.com/wikimedia/apps-android-commons/pull/41 
Change-Id: I46d0a77481dbe64a268a72f3efe49ae72168541f 
							
						 
						
							2013-08-27 03:51:14 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								1b6d74f7ca 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I4163b07b1154ee20bac2ef1a204ac048eec252ad 
							
						 
						
							2013-07-08 07:38:02 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								a3a1981033 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I9e7df009e5e99049ffe1f58bcfb23cd4a6da5a22 
							
						 
						
							2013-06-30 16:55:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brion Vibber 
								
							 
						 
						
							
							
							
							
								
							
							
								6c97d3e01b 
								
							 
						 
						
							
							
								
								Bug 48995: Add acceptable use 'tutorial' to app  
							
							... 
							
							
							
							Initial port of the acceptable use tutorial from iOS app. This version uses static images and is not yet animated. Indicator circles on the pager are done using Apache-licensed https://github.com/JakeWharton/Android-ViewPagerIndicator  -- imported via maven. Currently the tutorial launches when we reach the login screen (as when first installing the app or creating a new account from system settings). You can either 'back' out of it or page through and hit the 'yes' button.
GitHub: https://github.com/wikimedia/apps-android-commons/pull/20 
Change-Id: Ibc444102e28a55bfa7bbae601ff0c56268a0c7dd 
							
						 
						
							2013-06-24 14:24:38 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d1ee62d08c 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I57c836735a9535277f3a6a00f2bcf31d46e7912e 
							
						 
						
							2013-06-24 13:48:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuviPanda 
								
							 
						 
						
							
							
							
							
								
							
							
								55525bc100 
								
							 
						 
						
							
							
								
								Allow users to select preferred license for their contributions  
							
							... 
							
							
							
							Needs some UI love on both selection & intimation, but works otherwise
People can pick from CC BY-SA, CC BY, or CC0. The commons templates
are set using {[self}}, which I think is good enough.
GitHub: https://github.com/wikimedia/apps-android-commons/pull/14 
Change-Id: Iffca6f75c63de6fbe61c4dc41b93dd5f692065a5 
							
						 
						
							2013-06-18 08:43:17 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Translation updater bot 
								
							 
						 
						
							
							
							
							
								
							
							
								48e603e743 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							... 
							
							
							
							Change-Id: I0626c903aebb0f99f7943c830d90dce78f0a9b82 
							
						 
						
							2013-06-17 11:27:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								e11c1f2a73 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-06-10 08:45:09 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brion Vibber 
								
							 
						 
						
							
							
							
							
								
							
							
								f24e013db3 
								
							 
						 
						
							
							
								
								i18nize 'Download' menu item  
							
							
							
						 
						
							2013-05-21 15:43:51 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								772a5280f9 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-05-20 09:36:33 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brion Vibber 
								
							 
						 
						
							
							
							
							
								
							
							
								eac7fdb575 
								
							 
						 
						
							
							
								
								Briefly mention CC-BY-SA on the upload info page!  
							
							
							
						 
						
							2013-05-17 13:25:15 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brion Vibber 
								
							 
						 
						
							
							
							
							
								
							
							
								d7ea80437a 
								
							 
						 
						
							
							
								
								Add menu items for 'retry' and 'abort' on detail view  
							
							
							
						 
						
							2013-05-09 15:18:18 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								ce66748950 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-05-09 13:40:58 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brion Vibber 
								
							 
						 
						
							
							
							
							
								
							
							
								5b8990be0e 
								
							 
						 
						
							
							
								
								Localize messages for first sync / no images  
							
							
							
						 
						
							2013-05-06 11:53:31 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								06ba377eb0 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-04-28 17:49:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								9288aec9d6 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-04-21 12:29:15 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								34419ce68f 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-04-14 11:56:11 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								73226fcd95 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-04-07 17:09:31 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								c429b7649d 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-04-07 10:36:50 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								7f34831388 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-04-01 12:58:54 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								5eb69c6e02 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-03-23 13:25:59 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								534ac658a1 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-03-18 00:45:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								01beca0da1 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-03-11 04:46:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								61f7def139 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-03-04 11:46:07 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuviPanda 
								
							 
						 
						
							
							
							
							
								
							
							
								e2a1b650b7 
								
							 
						 
						
							
							
								
								Revert "Localisation updates from  http://translatewiki.net ."  
							
							... 
							
							
							
							Breaks the build because of
https://bugzilla.wikimedia.org/show_bug.cgi?id=45354 
and presence of more-than-two-letter ISO language codes
This reverts commit a29a07b418 
							
						 
						
							2013-02-25 18:14:19 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								a29a07b418 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-02-24 16:40:14 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuviPanda 
								
							 
						 
						
							
							
							
							
								
							
							
								c1afe3f61e 
								
							 
						 
						
							
							
								
								Fix for apostrophe's in qq messages  
							
							
							
						 
						
							2013-02-17 12:27:01 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								b00e592629 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-02-16 05:10:44 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Siebrand Mazeland 
								
							 
						 
						
							
							
							
							
								
							
							
								27ad2a6443 
								
							 
						 
						
							
							
								
								Localisation updates from  http://translatewiki.net .  
							
							
							
						 
						
							2013-02-11 18:04:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niklas Laxström 
								
							 
						 
						
							
							
							
							
								
							
							
								b7603f7793 
								
							 
						 
						
							
							
								
								Quick sanitization on messages  
							
							
							
						 
						
							2013-02-11 13:43:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuviPanda 
								
							 
						 
						
							
							
							
							
								
							
							
								df950dec50 
								
							 
						 
						
							
							
								
								Added qq translation strings & removed unused strings  
							
							... 
							
							
							
							Using qq instead of qqq because Android doesn't support 3 letter
language codes 
							
						 
						
							2013-02-07 23:24:06 +05:30