apps-android-commons/commons/res
Adam Jones ba222e147d Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'
Conflicts:
	commons/res/values-br/strings.xml
	commons/res/values-ca/strings.xml
	commons/res/values-cs/strings.xml
	commons/res/values-cy/strings.xml
	commons/res/values-da/strings.xml
	commons/res/values-de/strings.xml
	commons/res/values-el/strings.xml
	commons/res/values-es/strings.xml
	commons/res/values-fi/strings.xml
	commons/res/values-fo/strings.xml
	commons/res/values-fr/strings.xml
	commons/res/values-gl/strings.xml
	commons/res/values-id/strings.xml
	commons/res/values-it/strings.xml
	commons/res/values-ja/strings.xml
	commons/res/values-ka/strings.xml
	commons/res/values-km/strings.xml
	commons/res/values-ko/strings.xml
	commons/res/values-ky/strings.xml
	commons/res/values-la/strings.xml
	commons/res/values-lb/strings.xml
	commons/res/values-mk/strings.xml
	commons/res/values-ml/strings.xml
	commons/res/values-ms/strings.xml
	commons/res/values-mt/strings.xml
	commons/res/values-nb/strings.xml
	commons/res/values-ne/strings.xml
	commons/res/values-nl/strings.xml
	commons/res/values-oc/strings.xml
	commons/res/values-or/strings.xml
	commons/res/values-pa/strings.xml
	commons/res/values-pl/strings.xml
	commons/res/values-pt-rBR/strings.xml
	commons/res/values-pt/strings.xml
	commons/res/values-qq/strings.xml
	commons/res/values-ro/strings.xml
	commons/res/values-ru/strings.xml
	commons/res/values-sk/strings.xml
	commons/res/values-su/strings.xml
	commons/res/values-sv/strings.xml
	commons/res/values-te/strings.xml
	commons/res/values-tr/strings.xml
	commons/res/values-uk/strings.xml
	commons/res/values-vi/strings.xml
	commons/res/values-yi/strings.xml
	commons/res/values-zh-rCN/strings.xml
	commons/res/values-zh-rTW/strings.xml
	commons/res/values-zh/strings.xml
	commons/res/values/strings.xml
2016-06-06 07:29:27 +01:00
..
values Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-br Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ca Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-cs Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-cy Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-da Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-de Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-el Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-es Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-fi Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-fo Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-fr Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-gl Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-id Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-it Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ja Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ka Fix translations 2016-06-03 21:50:31 +01:00
values-km Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ko Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ky Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-la Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-lb Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-mk Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ml Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ms Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-mt Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-nb Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ne Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-nl Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-oc Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-or Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-pa Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-pl Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-pt Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-pt-rBR Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-qq Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ro Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-ru Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-sk Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-su Fix translations 2016-06-03 21:50:31 +01:00
values-sv Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-te Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-tr Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-uk Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-vi Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-yi Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-zh Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-zh-rCN Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00
values-zh-rTW Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2016-06-06 07:29:27 +01:00