SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
		
							parent
							
								
									54bc828a56
								
							
						
					
					
						commit
						640296c154
					
				@ -52,7 +52,6 @@ Name[tg]=Насими торик
 | 
			
		||||
Name[tr]=Esinti Koyu
 | 
			
		||||
Name[uk]=Темна Breeze
 | 
			
		||||
Name[vi]=Breeze Tối
 | 
			
		||||
Name[x-test]=xxBreeze Darkxx
 | 
			
		||||
Name[zh_CN]=Breeze 微风深色
 | 
			
		||||
Name[zh_TW]=Breeze Dark
 | 
			
		||||
 | 
			
		||||
@ -103,7 +102,6 @@ Comment[tg]=Насими торик аз KDE VDG
 | 
			
		||||
Comment[tr]=KDE Görsel Tasarım grubundan Esinti Koyu
 | 
			
		||||
Comment[uk]=Breeze Dark, автори — KDE VDG
 | 
			
		||||
Comment[vi]=Breeze Tối, do KDE VDG
 | 
			
		||||
Comment[x-test]=xxBreeze Dark by the KDE VDGxx
 | 
			
		||||
Comment[zh_CN]=Breeze 微风深色主题,由 KDE VDG (视觉设计团队) 设计制作
 | 
			
		||||
Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Dark
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -52,7 +52,6 @@ Name[tg]=Насим
 | 
			
		||||
Name[tr]=Esinti
 | 
			
		||||
Name[uk]=Breeze
 | 
			
		||||
Name[vi]=Breeze
 | 
			
		||||
Name[x-test]=xxBreezexx
 | 
			
		||||
Name[zh_CN]=Breeze 微风
 | 
			
		||||
Name[zh_TW]=Breeze
 | 
			
		||||
 | 
			
		||||
@ -103,7 +102,6 @@ Comment[tg]=Насим аз KDE VDG
 | 
			
		||||
Comment[tr]=KDE Görsel Tasarım grubundan Esinti
 | 
			
		||||
Comment[uk]=Breeze, автори — KDE VDG
 | 
			
		||||
Comment[vi]=Breeze, do KDE VDG
 | 
			
		||||
Comment[x-test]=xxBreeze by the KDE VDGxx
 | 
			
		||||
Comment[zh_CN]=Breeze 微风主题,由 KDE VDG (视觉设计团队) 设计制作
 | 
			
		||||
Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user