Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/res/values-nl/strings.xml
This commit is contained in:
		
						commit
						c7e126d0e7
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		|  | @ -13,8 +13,8 @@ | |||
| 
 | ||||
|     <!-- tabs --> | ||||
|     <string name="tab_map">Kaart</string> | ||||
|     <string name="tab_last_track">Laatste Baan</string> | ||||
|     <string name="tab_last_tracks">Last Tracks</string> | ||||
|     <string name="tab_last_track">Laatste baan</string> | ||||
|     <string name="tab_last_tracks">Laatste banen</string> | ||||
| 
 | ||||
|     <!-- notification --> | ||||
|     <string name="notification_title_trackbook_running">Trackbook is actief</string> | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 y20k
						y20k