Merge branch 'help' of github.com:gergelypolonkai/astrognome into help
Conflicts: Makefile.am configure.ac help/C/index.page help/Makefile.am help/hu/hu.po
This commit is contained in:
		
							
								
								
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -67,6 +67,12 @@ Makefile.in | |||||||
| /help/*/legal.xml | /help/*/legal.xml | ||||||
| !/help/C/legal.xml | !/help/C/legal.xml | ||||||
|  |  | ||||||
|  | # Yelp related files | ||||||
|  | /help/*/*.mo | ||||||
|  | /help/*/*.stamp | ||||||
|  | /help/*/*.page | ||||||
|  | !/help/C/*.page | ||||||
|  |  | ||||||
| #Documentation related files | #Documentation related files | ||||||
| /docs/reference/*/*.args | /docs/reference/*/*.args | ||||||
| /docs/reference/*/*.hierarchy | /docs/reference/*/*.hierarchy | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| # Hungarian translation of gnome-terminal help | # Hungarian translation of astrognome help | ||||||
| # Copyright (C) 2013. Free Software Foundation, Inc. | # Copyright (C) 2013. Free Software Foundation, Inc. | ||||||
| # This file is distributed under the same license as the gnome-terminal help. | # This file is distributed under the same license as the gnome-terminal help. | ||||||
|   |   | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user