Merge pull request #2516 from Catrobat/release-0.9.30

cheidenreich · web-flow · commit 82f7a273d958 · 2017-09-23T17:12:39.000+02:00
Release 0.9.30
diff --git a/catroid/build.gradle b/catroid/build.gradle
@@ -223,9 +223,9 @@ android {
         targetSdkVersion 22
         applicationId appId
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
-        versionCode 36
+        versionCode 38
         println "VersionCode is " + versionCode
-        versionName "0.9.29"
+        versionName "0.9.30"
         println "VersionName is " + versionName
         buildConfigField "String", "GIT_DESCRIBE", "\"${versionName}\""
         buildConfigField "String", "GIT_CURRENT_BRANCH", "\"${getCurrentGitBranch()}\""
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.java
@@ -336,7 +336,8 @@ public void handleHelpButton(View view) {
 			return;
 		}
 
-		startWebViewActivity(Constants.CATROBAT_HELP_URL);
+		Intent helpUrlIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.CATROBAT_HELP_URL));
+		startActivity(helpUrlIntent);
 	}
 
 	public void handleWebButton(View view) {
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.java
@@ -233,7 +233,9 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
 		}
 
 		private boolean checkIfWebViewVisitExternalWebsite(String url) {
-			if (url.contains(Constants.BASE_URL_HTTPS) || url.contains(Constants.LIBRARY_BASE_URL)) {
+			// help URL has to be opened in an external browser
+			if ((url.contains(Constants.BASE_URL_HTTPS) && !url.contains(Constants.CATROBAT_HELP_URL))
+					|| url.contains(Constants.LIBRARY_BASE_URL)) {
 				return false;
 			}
 			return true;
diff --git a/catroid/src/main/res/values-ko/strings.xml b/catroid/src/main/res/values-ko/strings.xml
@@ -240,7 +240,7 @@
   <string name="project_name">프로그램:</string>
   <string name="my_projects_activity_title">프로그램</string>
   <string name="number_of_objects">오브젝트:</string>
-  <string name="start_scene_name">\"%1$s\" (첫 장면)</string>
+  <string name="start_scene_name">%1$s (첫 장면)</string>
   <string name="number_of_scripts">스크립트:</string>
   <string name="number_of_bricks">블록:</string>
   <string name="number_of_looks">모양:</string>
@@ -257,7 +257,7 @@
   <string name="select_all">모두 선택</string>
   <string name="deselect_all">모든 선택 취소</string>
   <string name="backpack_replace_object"> \"%1$s\" 스프라이트는 스프라이트 모음에 이미 있습니다. 그것을 바꾸시겠습니까?</string>
-  <string name="backpack_replace_scene">모양 \"%1$s\"는 오브젝트 모음에 이미 있습니다. 그것을 대체하시겠습니까?</string>
+  <string name="backpack_replace_scene">모양 %1$s 는 오브젝트 모음에 이미 있습니다. 그것을 대체하시겠습니까?</string>
   <string name="backpack_replace_object_multiple">오브젝트는 오브젝트 모음에 이미 있습니다. 그것을 바꾸시겠습니까?</string>
   <string name="groups_create">그룹 만들기</string>
   <string name="group_created">그룹이 만들어 졌습니다.</string>
@@ -471,7 +471,7 @@
   <string name="merge_scene_label_one">병합</string>
   <!-- Play scene dialog -->
   <string name="play_scene_dialog_title">플레이 장면:</string>
-  <string name="play_scene_dialog_default">첫 번째 장면 (\"%1$s\")</string>
+  <string name="play_scene_dialog_default">첫 번째 장면 (%1$s)</string>
   <string name="play_scene_dialog_current">현재 (\"%1$s\")</string>
   <!--  -->
   <!-- New sprite dialog -->
@@ -724,7 +724,7 @@
   <!--  -->
   <!-- defaultValues -->
   <string name="default_project_name">내 첫 프로그램</string>
-  <string name="default_scene_name">장면 \"%1$d\"</string>
+  <string name="default_scene_name">장면 %1$d</string>
   <string name="default_project_background_name">배경</string>
   <string name="default_project_cloud_name">클라우드</string>
   <string name="default_project_cloud_sprite_name_1">클라우드1</string>
diff --git a/catroid/src/main/res/values-sw/strings.xml b/catroid/src/main/res/values-sw/strings.xml
@@ -58,8 +58,8 @@
   <string name="loading_check_oauth_username">upatikanaji wa jina la mtumiaji linakaguliwa kwenye seva zetu</string>
   <string name="loading_facebook_exchange_token">ishara ya facebook inabadilishana na kwenye seva zetu</string>
   <string name="loading_facebook_login">Kuingia facebook kumekamilika kwenye seva zetu&#8230;</string>
-  <string name="loading_google_exchange_code"> neno siri ya google inabadilishwa kwenye seva zetu</string>
-  <string name="loading_google_login">kuingia google kumekamilika kwenye seva zetu</string>
+  <string name="loading_google_exchange_code">Msimbo Google+ inabadilishwa kwenye seva zetu&#8230;</string>
+  <string name="loading_google_login">Kuingia Google+ kumekamilika kwenye seva zetu&#8230;</string>
   <string name="background">Mandharinyuma</string>
   <string name="stage">Steji</string>
   <string name="ok">Sawa</string>
@@ -108,16 +108,16 @@
   <string name="marketing_more_on_google_play">Programu zaidi kwenye Google Play</string>
   <!-- Settings activity -->
   <string name="preference_title">Mipangilio</string>
-  <string name="preference_title_enable_quadcopter_bricks">kasuku AR.ndege  matofari</string>
-  <string name="preference_description_quadcopter_bricks">ruhusu kuthibiti AR.ndege ya 2.0 ya mapanga zunguka</string>
-  <string name="preference_title_enable_mindstorms_nxt_bricks">mkondo wa vifaa unganiko NXT matofari</string>
-  <string name="preference_title_enable_mindstorms_ev3_bricks">mkondo wa vifaa unganiko EV3 matofari</string>
+  <string name="preference_title_enable_quadcopter_bricks">Kasuku AR.Ndege nyuki matofari</string>
+  <string name="preference_description_quadcopter_bricks">Ruhusu kuthibiti AR.Ndege nyuki ya 2.0 ya mapanga zunguka</string>
+  <string name="preference_title_enable_mindstorms_nxt_bricks">Mkondo wa vifaa unganiko NXT matofari</string>
+  <string name="preference_title_enable_mindstorms_ev3_bricks">Mkondo wa vifaa unganiko EV3 matofari</string>
   <string name="preference_description_mindstorms_nxt_bricks">ruhusu kuthibiti mkondo wa vifaa unganiko NXT roboti</string>
   <string name="preference_description_mindstorms_ev3_bricks">ruhusu kuthibiti mkondo wa vifaa unganiko EV3 roboti</string>
   <string name="preference_title_mindstorms_nxt_sensors">Lego NXT Vihisio</string>
   <string name="preference_title_mindstorms_ev3_sensors">Lego NXT Vihisio</string>
   <string name="preference_title_drone_config_properties">Usanidi sifa wa Ndege nyuki</string>
-  <string name="preference_title_enable_phiro_bricks">matofari ya phiro</string>
+  <string name="preference_title_enable_phiro_bricks">Matofari ya phiro</string>
   <string name="preference_description_phiro_bricks">Ruhusu kudhibiti Phiro robots</string>
   <string name="preference_title_enable_arduino_bricks">Matofali ya Arduino</string>
   <string name="preference_title_cast_feature_globally_enabled">wezesha vipengele vya kurushwa</string>
@@ -273,7 +273,7 @@
   <string name="backpack_replace_scene_multiple">Pazia tayari zipo katika Mkoba wa mgongoni. Je, unataka kubadilisha yao?</string>
   <!--  -->
   <!-- Sprite activity -->
-  <string name="copy_sprite_name_suffix">nakala</string>
+  <string name="copy_sprite_name_suffix">_Nakala</string>
   <!--  -->
   <!-- Script activity -->
   <string name="scripts">Hati</string>
@@ -305,7 +305,7 @@
     <item quantity="other">Nakala %d matofali</item>
   </plurals>
   <plurals name="number_of_bricks_to_backpack">
-    <item quantity="one">mkoba wa begani %d matofali</item>
+    <item quantity="one">Mkoba wa begani %d matofali</item>
     <item quantity="other">mkoba wa begani %d matofali</item>
   </plurals>
   <!--  -->
@@ -484,11 +484,11 @@
   <!-- Play scene dialog -->
   <string name="play_scene_dialog_title">Chezesha tukio:</string>
   <string name="play_scene_dialog_default">Tukio la kwanza(%1$s)</string>
-  <string name="play_scene_dialog_current">Tukio la sasa(%1$s)</string>
+  <string name="play_scene_dialog_current">Sasa(%1$s)</string>
   <!--  -->
   <!-- New sprite dialog -->
-  <string name="new_sprite_dialog_default_sprite_name">Kipengele changu</string>
-  <string name="new_sprite_dialog_title">Kipengele kipya</string>
+  <string name="new_sprite_dialog_default_sprite_name">Kipengee changu</string>
+  <string name="new_sprite_dialog_title">Kipengee kipya</string>
   <string name="spritename_already_exists">Tafadhali chagua tena jina la kipengele.</string>
   <string name="rename_sprite_dialog">Andika tena kipengele</string>
   <string name="spritename_invalid">Jina kipengele hiki ni batili</string>
@@ -1161,9 +1161,9 @@
   <string name="formula_editor_function_no_parameter"></string>
   <string name="formula_editor_function_touch_parameter">(1)</string>
   <string name="formula_editor_function_list_item">elementi</string>
-  <string name="formula_editor_function_list_item_parameter">(1,*orodhesha jina)</string>
+  <string name="formula_editor_function_list_item_parameter">(1,*orodhesha jina*)</string>
   <string name="formula_editor_function_contains">ina</string>
-  <string name="formula_editor_function_contains_parameter">(*orodhesha jina*1)</string>
+  <string name="formula_editor_function_contains_parameter">(*orodhesha jina*,1)</string>
   <string name="formula_editor_function_collision">gusa_kipengee</string>
   <string name="formula_editor_function_collides_with_edge">gusa_incha</string>
   <string name="formula_editor_function_touched">gusa_kidole</string>

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,8 @@ public void handleHelpButton(View view) {`
`336`	`336`	`return;`
`337`	`337`	`}`
`338`	`338`
`339`		`- startWebViewActivity(Constants.CATROBAT_HELP_URL);`
	`339`	`+ Intent helpUrlIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.CATROBAT_HELP_URL));`
	`340`	`+ startActivity(helpUrlIntent);`
`340`	`341`	`}`
`341`	`342`
`342`	`343`	`public void handleWebButton(View view) {`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,9 @@ public void onReceivedError(WebView view, int errorCode, String description, Str`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`private boolean checkIfWebViewVisitExternalWebsite(String url) {`
`236`		`- if (url.contains(Constants.BASE_URL_HTTPS) \|\| url.contains(Constants.LIBRARY_BASE_URL)) {`
	`236`	`+ // help URL has to be opened in an external browser`
	`237`	`+ if ((url.contains(Constants.BASE_URL_HTTPS) && !url.contains(Constants.CATROBAT_HELP_URL))`
	`238`	`+ \|\| url.contains(Constants.LIBRARY_BASE_URL)) {`
`237`	`239`	`return false;`
`238`	`240`	`}`
`239`	`241`	`return true;`