Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-06 21:18:29 +01:00
commit 98e313e8f6

View file

@ -4,11 +4,11 @@
<string name="app_name_ver">OsmAnd 1.9.3</string> <string name="app_name_ver">OsmAnd 1.9.3</string>
<string name="app_version">1.9.3</string> <string name="app_version">1.9.3</string>
<!-- <!--
Note: For our dev build apk's, the above app_version should be provided as the base version prefix to our build number in the format: X.X.X#BUILD+BRANCH Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
To achieve this, keep the value of app_version in sync with X.X.X#YYYYZ , where
file: osmand/build.xml' X.X.X is the above base (released) app version,
line: <replaceregexp file="res/values/no_translate.xml" ... YYYY is the build number of build branch Z
item X.X.X in: replace='"app_version"&gt;X.X.X${build.version}&lt;' Z : M=-master, D=-design, B=-Blackberry, MD=-main-default, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
--> -->
<!-- Not translatable --> <!-- Not translatable -->