Merge remote-tracking branch 'origin/master'

brodeurlv · Feb 22, 2020 · 713b559 · 713b559
2 parents 28499fc + d818501
commit 713b559
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018, Charles Combes
+Copyright (c) 2019-2020, Charles Combes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ See [Contributing.md](/Contributing.md/)
 
 BSD 3-Clause License
 
-Copyright (c) 2019, Charles Combes
+Copyright (c) 2019-2020, Charles Combes
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -102,6 +102,7 @@
     <string name="pref_bodybuilding_setting">Configurações de musculação</string>
     <string name="pref_preferredUnitSummary">Unidade preferida:</string>
     <string name="pref_preferredUnitTitle">Selecione sua unidade de peso preferida</string>
+    <string name="pref_preferredDistanceUnitTitle">Selecione sua unidade de distância preferida</string>
 
     <string name="pref_user_name">Definir nome de usuário</string>
     <string name="pref_user_name_summary">Defina seu nome de usuário</string>
@@ -313,8 +314,8 @@
     <string name="import_new_exercise_first">(importe novos exercícios primeiro)</string>
     <string name="MachineHint">Nome do seu exercício</string>
     <string name="trapezius">Trapézios</string>
-    <string name="shoulders">Ombros</string>
     <string name="obliques">Oblíquos</string>
-    <string name="pref_preferredDistanceUnitTitle">Selecione sua unidade de distância preferida</string>
+    <string name="shoulders">Ombros</string>
+    <string name="timeLabel">Tempo</string>
 
 </resources>