Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						9d724e0fe4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature_cmake_style' into develop
						
						
						
						
						
						
						
						Conflicts:
	CMakeLists.txt 
						
						
					 | 
					
						2014-04-21 23:33:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						7de007502c
					 | 
					
						
						
							
							Update FR translation some more.
						
						
						
						
						
						
					 | 
					
						2014-04-21 21:46:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						6ded1168b0
					 | 
					
						
						
							
							Fix french translation.
						
						
						
						
						
						
					 | 
					
						2014-04-21 21:37:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elros
							
						 
					 | 
					
						
						
							
						
						eea347b82c
					 | 
					
						
						
							
							Add french translation from #217
						
						
						
						
						
						
						
						Closes #217 
						
						
					 | 
					
						2014-04-19 12:46:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						dd7b6642a3
					 | 
					
						
						
							
							Use the same style of CMake files everywhere
						
						
						
						
						
						
					 | 
					
						2014-04-06 19:43:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						f9169654c5
					 | 
					
						
						
							
							Build fixage for the changed build config
						
						
						
						
						
						
					 | 
					
						2014-04-06 03:48:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						00f4f533aa
					 | 
					
						
						
							
							Fix to the way translations are handled. Also updated the german translation with the new strings.
						
						
						
						
						
						
					 | 
					
						2014-02-25 18:46:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								p-schneider
							
						 
					 | 
					
						
						
							
						
						725e6a36bb
					 | 
					
						
						
							
							fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation)
						
						
						
						
						
						
					 | 
					
						2014-02-14 13:39:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ACGaming
							
						 
					 | 
					
						
						
							
						
						58741d2df4
					 | 
					
						
						
							
							Complete revision of the German language file
						
						
						
						
						
						
					 | 
					
						2014-01-19 17:38:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						9bbbb05060
					 | 
					
						
						
							
							Add xnrand to the translation credits
						
						
						
						
						
						
					 | 
					
						2014-01-04 13:35:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xnrand
							
						 
					 | 
					
						
						
							
						
						0885668292
					 | 
					
						
						
							
							Update mmc_de.ts
						
						
						
						
						
						
						
						Fixed grammar, improved wording.
It's not perfect but definitely better. 
						
						
					 | 
					
						2014-01-04 13:02:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						0f1a3329e4
					 | 
					
						
						
							
							Du/Sie consistency
						
						
						
						
						
						
					 | 
					
						2014-01-04 12:58:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						998a14c95d
					 | 
					
						
						
							
							Update the german translation
						
						
						
						
						
						
					 | 
					
						2014-01-04 11:54:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kilobyte22
							
						 
					 | 
					
						
						
							
						
						23b9a28a15
					 | 
					
						
						
							
							Updated german language file
						
						
						
						
						
						
					 | 
					
						2013-10-10 21:20:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kilobyte
							
						 
					 | 
					
						
						
							
						
						af234f3502
					 | 
					
						
						
							
							Fixed small thing in german language file
						
						
						
						
						
						
					 | 
					
						2013-09-23 12:46:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stiepen22
							
						 
					 | 
					
						
						
							
						
						80107170a4
					 | 
					
						
						
							
							Fixed a small spelling mistake in german translation
						
						
						
						
						
						
					 | 
					
						2013-09-09 12:18:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stiepen22
							
						 
					 | 
					
						
						
							
						
						ed5359796e
					 | 
					
						
						
							
							Renamed german lang file
						
						
						
						
						
						
					 | 
					
						2013-09-09 12:11:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stiepen22
							
						 
					 | 
					
						
						
							
						
						3e1cb57988
					 | 
					
						
						
							
							Filed attempt on making localization work
						
						
						
						
						
						
					 | 
					
						2013-09-08 23:43:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stiepen22
							
						 
					 | 
					
						
						
							
						
						45a338a3cd
					 | 
					
						
						
							
							Added lang file - derp
						
						
						
						
						
						
					 | 
					
						2013-09-08 20:30:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |