diff --git a/.github/workflows/scheduled-upload-crowdin.yml b/.github/workflows/scheduled-upload-crowdin.yml deleted file mode 100644 index 88a17ac23e2..00000000000 --- a/.github/workflows/scheduled-upload-crowdin.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: scheduled-upload-crowdin - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: develop - - name: Upload Strings to Crowdin - env: - CROWDIN_KEY: ${{ secrets.CROWDIN_API }} - run: 'curl -F "files[catroid/src/main/res/values/strings.xml]=@catroid/src/main/res/values/strings.xml" - -F "export_patterns[catroid/src/main/res/values/strings.xml]=catroid/src/main/res/values-%android_code%/%original_file_name%" - -F "titles[catroid/src/main/res/values/strings.xml]=Pocket Code for Android" "https://api.crowdin.com/api/project/catrobat/update-file?key="$CROWDIN_KEY' diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml index 842815cc4b6..887d6ef62ce 100644 --- a/.github/workflows/sync_crowdin.yml +++ b/.github/workflows/sync_crowdin.yml @@ -49,7 +49,8 @@ jobs: - uses: crowdin/github-action@1.0.10 with: - upload_translations: true + upload_sources: true + upload_translations: false download_translations: true config: 'crowdin.yml' env: diff --git a/catroid/build.gradle b/catroid/build.gradle index 223c1efb0e5..59b44903680 100644 --- a/catroid/build.gradle +++ b/catroid/build.gradle @@ -105,8 +105,8 @@ jacocoAndroidUnitTestReport { xml.enabled true } -def defaultVersionCode = 84 -def defaultVersionName = "1.0.2" +def defaultVersionCode = 85 +def defaultVersionName = "1.0.3" android { compileSdkVersion 29 @@ -332,6 +332,7 @@ dependencies { // Paintroid local aar lib files implementation fileTree(dir: 'src/main/libs', include: ['*.aar']) + implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/catroid/config/lint-baseline.xml b/catroid/config/lint-baseline.xml index 624d3f344e3..98c2426d432 100644 --- a/catroid/config/lint-baseline.xml +++ b/catroid/config/lint-baseline.xml @@ -29,84 +29,18 @@ errorLine1=" public void onActivityResult(int requestCode, int resultCode, Intent data) {" errorLine2=" ~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - - - - - - - - - @@ -117,7 +51,7 @@ errorLine1=" private static final CastManager INSTANCE = new CastManager();" errorLine2=" ~~~~~~"> @@ -128,7 +62,7 @@ errorLine1=" private static Context context;" errorLine2=" ~~~~~~"> @@ -139,7 +73,7 @@ errorLine1=" private Activity activity;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -150,7 +84,7 @@ errorLine1=" private class ConnectDeviceTask extends AsyncTask<String, Void, BluetoothConnection.State> {" errorLine2=" ~~~~~~~~~~~~~~~~~"> @@ -161,7 +95,7 @@ errorLine1=" private Context context;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -172,7 +106,7 @@ errorLine1=" private Context context;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -183,8 +117,8 @@ errorLine1=" private static FormulaEditorEditText formulaEditorEditText;" errorLine2=" ~~~~~~"> @@ -194,8 +128,8 @@ errorLine1=" private static LinearLayout formulaEditorBrick;" errorLine2=" ~~~~~~"> @@ -205,8 +139,8 @@ errorLine1=" private static FormulaBrick formulaBrick;" errorLine2=" ~~~~~~"> @@ -216,7 +150,7 @@ errorLine1=" private Context context;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -227,7 +161,7 @@ errorLine1=" private Context context;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -238,7 +172,7 @@ errorLine1=" private Context context;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -249,7 +183,7 @@ errorLine1=" private class ReadTask extends AsyncTask<UserList, Void, Void> {" errorLine2=" ~~~~~~~~"> @@ -260,7 +194,7 @@ errorLine1=" private class ReadTask extends AsyncTask<UserVariable, Void, Void> {" errorLine2=" ~~~~~~~~"> @@ -271,8 +205,8 @@ errorLine1=" private class FinishThreadAndDisposeTexturesTask extends AsyncTask<Void, Void, Void> {" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -282,7 +216,7 @@ errorLine1=" private class WriteTask extends AsyncTask<UserList, Void, Void> {" errorLine2=" ~~~~~~~~~"> @@ -293,7 +227,7 @@ errorLine1=" private class WriteTask extends AsyncTask<UserVariable, Void, Void> {" errorLine2=" ~~~~~~~~~"> @@ -302,22 +236,22 @@ id="UnusedResources" message="The resource `R.drawable.brick_brown_2h_9` appears to be unused"> + file="src/main/res/drawable-ldpi/brick_brown_2h_9.9.png"/> + file="src/main/res/drawable-mdpi/brick_brown_2h_9.9.png"/> + file="src/main/res/drawable-xhdpi/brick_brown_2h_9.9.png"/> + file="src/main/res/drawable-ldpi/brick_control_1h.9.png"/> + file="src/main/res/drawable-mdpi/brick_control_1h.9.png"/> + file="src/main/res/drawable-xhdpi/brick_control_1h.9.png"/> + file="src/main/res/mipmap-hdpi/ic_launcher_round.png"/> + file="src/main/res/mipmap-mdpi/ic_launcher_round.png"/> + file="src/main/res/mipmap-xhdpi/ic_launcher_round.png"/> + file="src/main/res/mipmap-xxhdpi/ic_launcher_round.png"/> + file="src/main/res/mipmap-xxxhdpi/ic_launcher_round.png"/> @@ -358,7 +292,7 @@ errorLine1=" <style name="BrickContainer.Script.Small">" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -367,28 +301,28 @@ id="IconDensities" message="Missing the following drawables in `drawable-hdpi`: brick_blue_1h.9.png, brick_blue_2h.9.png, brick_blue_2h_when_9.9.png, brick_blue_3h.9.png, brick_brown_1h_when_9.9.png... (42 more)"> + file="src/main/res/drawable-hdpi"/> + message="Missing the following drawables in `drawable-mdpi`: ardrone_neg.png, ardrone_pos.png, arduino_neg.png, arduino_pos.png, brick_selection_background_bluetooth.9.png... (44 more)"> + file="src/main/res/drawable-mdpi"/> + message="Missing the following drawables in `drawable-xhdpi`: embroidery_neg.png, embroidery_pos.png, favorites_72x72.png, google_playstore_logo.png, huawei_app_gallery_logo.png... (5 more)"> + file="src/main/res/drawable-xhdpi"/> + message="Missing the following drawables in `drawable-xxhdpi`: ardrone_neg.png, ardrone_pos.png, arduino_neg.png, arduino_pos.png, brick_blue_1h.9.png... (88 more)"> + file="src/main/res/drawable-xxhdpi"/> @@ -408,8 +342,8 @@ errorLine1=" public boolean onTouch(View view, MotionEvent event) {" errorLine2=" ~~~~~~~"> @@ -419,7 +353,7 @@ errorLine1=" public boolean onTouch(View v, MotionEvent event) {" errorLine2=" ~~~~~~~"> @@ -430,7 +364,7 @@ errorLine1=" btn.setOnTouchListener(otl);" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -441,7 +375,7 @@ errorLine1=" public boolean onTouch(View v, MotionEvent event) {" errorLine2=" ~~~~~~~"> @@ -452,7 +386,7 @@ errorLine1=" this.setOnTouchListener(this);" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -463,8 +397,8 @@ errorLine1=" public boolean onTouch(View view, MotionEvent event) {" errorLine2=" ~~~~~~~"> @@ -474,7 +408,7 @@ errorLine1=" public boolean onTouchEvent(MotionEvent e) {" errorLine2=" ~~~~~~~~~~~~"> @@ -485,8 +419,8 @@ errorLine1=" frameLayout.setOnTouchListener(this);" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -496,8 +430,8 @@ errorLine1=" public boolean onTouch(View view, MotionEvent event) {" errorLine2=" ~~~~~~~"> @@ -507,7 +441,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -518,7 +452,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -529,7 +463,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -540,7 +474,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -551,7 +485,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -562,7 +496,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -573,7 +507,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -584,7 +518,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -595,7 +529,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -606,7 +540,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -617,7 +551,7 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> @@ -628,29 +562,18 @@ errorLine1=" <ImageButton" errorLine2=" ~~~~~~~~~~~"> - - - - @@ -661,7 +584,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -672,7 +595,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -683,7 +606,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -694,7 +617,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -705,8 +628,8 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -716,7 +639,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -727,7 +650,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -738,7 +661,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -749,7 +672,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -760,7 +683,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -771,7 +694,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -782,7 +705,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -793,7 +716,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -804,7 +727,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -815,7 +738,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -826,7 +749,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -837,7 +760,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -848,7 +771,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -859,7 +782,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -870,7 +793,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -881,7 +804,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -892,7 +815,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -903,7 +826,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -914,7 +837,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -925,29 +848,18 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> - - - - @@ -958,7 +870,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -969,7 +881,7 @@ errorLine1=" <ImageView" errorLine2=" ~~~~~~~~~"> @@ -980,7 +892,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -991,7 +903,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1002,7 +914,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1013,7 +925,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1024,7 +936,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1035,7 +947,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1046,7 +958,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1057,7 +969,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1068,7 +980,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1079,7 +991,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1090,7 +1002,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1101,7 +1013,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1112,7 +1024,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1123,7 +1035,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1134,7 +1046,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1145,7 +1057,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1156,7 +1068,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1167,7 +1079,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1178,7 +1090,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1189,7 +1101,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1200,7 +1112,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1211,7 +1123,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1222,7 +1134,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1233,7 +1145,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_small"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1244,7 +1156,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1255,7 +1167,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1266,7 +1178,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1277,7 +1189,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1288,7 +1200,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1299,7 +1211,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1310,7 +1222,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_small"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1321,7 +1233,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_small"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1332,7 +1244,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1343,7 +1255,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1354,7 +1266,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1365,7 +1277,7 @@ errorLine1=" android:paddingStart="5dip"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1376,7 +1288,7 @@ errorLine1=" android:paddingStart="@dimen/device_text_view_padding"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1387,7 +1299,7 @@ errorLine1=" android:paddingStart="@dimen/device_text_view_padding"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1398,7 +1310,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_large"/>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1409,7 +1321,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_large"/>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1420,7 +1332,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_large"/>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1431,7 +1343,7 @@ errorLine1=" android:paddingStart="5dp">" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1442,7 +1354,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_large"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1453,7 +1365,7 @@ errorLine1=" android:paddingStart="@dimen/material_design_spacing_large"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1464,7 +1376,7 @@ errorLine1=" android:paddingEnd="@dimen/material_design_spacing_small" />" errorLine2=" ~~~~~~~~~~~~~~~~~~"> @@ -1475,7 +1387,7 @@ errorLine1=" android:paddingEnd="@dimen/details_spacing"" errorLine2=" ~~~~~~~~~~~~~~~~~~"> @@ -1486,7 +1398,7 @@ errorLine1=" android:paddingEnd="@dimen/details_spacing"" errorLine2=" ~~~~~~~~~~~~~~~~~~"> diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/BricksHelpUrlTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/BricksHelpUrlTest.java index 2a746ba9eb8..c23137c178f 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/BricksHelpUrlTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/BricksHelpUrlTest.java @@ -160,6 +160,8 @@ public class BricksHelpUrlTest { "https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/ChangeXByNBrick"); brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.ChangeColorByNBrick", "https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/ChangeColorByNBrick"); + brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.SetThreadColorBrick", + "https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/SetThreadColorBrick"); brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.TurnLeftSpeedBrick", "https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/TurnLeftSpeedBrick"); brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick", diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java index c9eb1e66cd8..10b71828826 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java @@ -25,6 +25,8 @@ import android.graphics.PointF; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.ActionFactory; import org.catrobat.catroid.content.Project; @@ -78,14 +80,15 @@ public void tearDown() { public void testAddSingleStitchPoint() { ActionFactory.createStitchAction(testSprite1).act(1f); Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand( - Mockito.eq(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, testSprite1.look.getZIndex(), testSprite1))); + Mockito.eq(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, + testSprite1.look.getZIndex(), testSprite1, Color.BLACK))); } @Test public void testAddPointsTwoSprites() { ActionFactory.createStitchAction(testSprite1).act(1f); ActionFactory.createStitchAction(testSprite2).act(1f); - Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, testSprite1.look.getZIndex(), testSprite1)); - Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords2.x, spriteCoords2.y, testSprite2.look.getZIndex(), testSprite2)); + Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, testSprite1.look.getZIndex(), testSprite1, Color.BLACK)); + Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords2.x, spriteCoords2.y, testSprite2.look.getZIndex(), testSprite2, Color.BLACK)); } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java index e31f2e10fea..e1b9407ef02 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java @@ -170,6 +170,7 @@ import org.catrobat.catroid.content.bricks.SetRotationStyleBrick; import org.catrobat.catroid.content.bricks.SetSizeToBrick; import org.catrobat.catroid.content.bricks.SetTempoBrick; +import org.catrobat.catroid.content.bricks.SetThreadColorBrick; import org.catrobat.catroid.content.bricks.SetTransparencyBrick; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.content.bricks.SetVelocityBrick; @@ -267,6 +268,7 @@ public static Collection data() { SetBounceBrick.class, SetFrictionBrick.class)}, {"Embroidery", Arrays.asList(StitchBrick.class, + SetThreadColorBrick.class, RunningStitchBrick.class, ZigZagStitchBrick.class, TripleStitchBrick.class, diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/RecentBricksTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/RecentBricksTest.java index 8e30df15b36..0173e59eb23 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/RecentBricksTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/RecentBricksTest.java @@ -52,7 +52,6 @@ import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.scrollTo; import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; -import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; @@ -89,19 +88,14 @@ public void testCheckNonBackgroundBricksAreHiddenForBackgroundSprites() { onView(withText(spriteName)).perform(click()); onView(withId(R.id.button_add)).perform(click()); - onView(withText(R.string.category_pen)).perform(waitFor(isDisplayed(), 5000)); - onView(withText(R.string.category_pen)).perform(scrollTo(), click()); - onView(withText(R.string.brick_clear_background)).perform(scrollTo(), click()); - onView(withId(android.R.id.list)).perform(click()); - - onView(withId(R.id.button_add)).perform(click()); - onView(withText(R.string.category_pen)).perform(scrollTo(), click()); - onView(withText(R.string.brick_stamp)).perform(scrollTo(), click()); + onView(withText(R.string.category_motion)).perform(scrollTo(), click()); + onView(withText(R.string.brick_if_on_edge_bounce)).perform(scrollTo()); + onView(withText(R.string.brick_if_on_edge_bounce)).perform(waitFor(isDisplayed(), 2000), click()); onView(withId(android.R.id.list)).perform(click()); onView(withId(R.id.button_add)).perform(click()); onView(withText(R.string.category_recently_used)).perform(click()); - onBrickAtPosition(1).checkShowsText(R.string.brick_stamp); + onBrickAtPosition(1).checkShowsText(R.string.brick_if_on_edge_bounce); pressBack(); pressBack(); @@ -110,8 +104,7 @@ public void testCheckNonBackgroundBricksAreHiddenForBackgroundSprites() { onView(withText(R.string.background)).perform(click()); onView(withId(R.id.button_add)).perform(click()); onView(withText(R.string.category_recently_used)).perform(click()); - onView(withText(R.string.brick_stamp)).check(doesNotExist()); - onView(withText(R.string.brick_clear_background)).check(matches(isDisplayed())); + onView(withText(R.string.brick_if_on_edge_bounce)).check(doesNotExist()); } @After diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTFileGeneratorTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTFileGeneratorTest.java index 6d80af5d567..49715b23e79 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTFileGeneratorTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTFileGeneratorTest.java @@ -24,6 +24,7 @@ package org.catrobat.catroid.test.embroidery; import com.android.dex.util.FileUtils; +import com.badlogic.gdx.graphics.Color; import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.common.Constants; @@ -72,15 +73,15 @@ public void setUp() throws IOException { @Test public void testWriteToSampleDSTFile() throws IOException { EmbroideryStream stream = new DSTStream(new DSTHeader()); - stream.addStitchPoint(-10, 0); - stream.addStitchPoint(10, 0); - stream.addStitchPoint(10, 10); - stream.addStitchPoint(0, 15); - stream.addStitchPoint(-10, 10); - stream.addStitchPoint(-10, 0); - stream.addStitchPoint(10, 10); - stream.addStitchPoint(-10, 10); - stream.addStitchPoint(10, 0); + stream.addStitchPoint(-10, 0, Color.BLACK); + stream.addStitchPoint(10, 0, Color.BLACK); + stream.addStitchPoint(10, 10, Color.BLACK); + stream.addStitchPoint(0, 15, Color.BLACK); + stream.addStitchPoint(-10, 10, Color.BLACK); + stream.addStitchPoint(-10, 0, Color.BLACK); + stream.addStitchPoint(10, 10, Color.BLACK); + stream.addStitchPoint(-10, 10, Color.BLACK); + stream.addStitchPoint(10, 0, Color.BLACK); DSTFileGenerator fileGenerator = new DSTFileGenerator(stream); fileGenerator.writeToDSTFile(dstFile); @@ -97,17 +98,17 @@ public void testWriteToSampleDSTFile() throws IOException { } private void addArrowToStream(EmbroideryStream stream, int shiftFactor) { - stream.addStitchPoint(0, shiftFactor); - stream.addStitchPoint(40, -40 + shiftFactor); - stream.addStitchPoint(-40, -40 + shiftFactor); - stream.addStitchPoint(0, shiftFactor); + stream.addStitchPoint(0, shiftFactor, Color.BLACK); + stream.addStitchPoint(40, -40 + shiftFactor, Color.BLACK); + stream.addStitchPoint(-40, -40 + shiftFactor, Color.BLACK); + stream.addStitchPoint(0, shiftFactor, Color.BLACK); } private void addColorChangeAndJumpToStream(EmbroideryStream stream, int shiftFactor) { stream.addColorChange(); - stream.addStitchPoint(0, shiftFactor); + stream.addStitchPoint(0, shiftFactor, Color.BLACK); stream.addJump(); - stream.addStitchPoint(0, shiftFactor); + stream.addStitchPoint(0, shiftFactor, Color.BLACK); } @Test diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTPatternManagerTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTPatternManagerTest.java index 0c4c2b8f9a0..6032e7199ab 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTPatternManagerTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTPatternManagerTest.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.test.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.embroidery.DSTPatternManager; import org.catrobat.catroid.embroidery.DSTStitchCommand; @@ -101,14 +103,14 @@ public void testClearEmbroideryPattern() { @Test public void testInvalidPattern() { - patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite)); + patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK)); assertFalse(patternManager.validPatternExists()); } @Test public void testValidPattern() { - patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite)); - patternManager.addStitchCommand(new DSTStitchCommand(0, 1, 0, sprite)); + patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK)); + patternManager.addStitchCommand(new DSTStitchCommand(0, 1, 0, sprite, Color.BLACK)); assertTrue(patternManager.validPatternExists()); } @@ -119,18 +121,18 @@ public void testEmptyEmbroideryPattern() { @Test public void testSingleLayerEmbroideryPatternList() { - StitchCommand command = new DSTStitchCommand(0, 0, 0, sprite); + StitchCommand command = new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK); patternManager.addStitchCommand(command); assertEquals(1, patternManager.getEmbroideryPatternList().size()); - assertEquals(new DSTStitchPoint(command.getX(), command.getY()), + assertEquals(new DSTStitchPoint(command.getX(), command.getY(), Color.BLACK), patternManager.getEmbroideryPatternList().get(0)); } @Test public void testMultilayerEmbroideryPatternList() { - patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite)); - patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 1, sprite)); + patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK)); + patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 1, sprite, Color.BLACK)); assertEquals(5, patternManager.getEmbroideryPatternList().size()); assertTrue(patternManager.getEmbroideryPatternList().get(1).isColorChangePoint()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchCommandTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchCommandTest.java index 38d7c5e96a3..8d4e84df0dc 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchCommandTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchCommandTest.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.test.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.embroidery.DSTStitchCommand; import org.catrobat.catroid.embroidery.DSTStream; @@ -69,7 +71,7 @@ public void setUp() { @Test public void testDSTStitchCommand() { - StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, sprite); + StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, sprite, Color.BLACK); assertEquals(xCoord, command.getX(), 0); assertEquals(yCoord, command.getY(), 0); @@ -79,10 +81,10 @@ public void testDSTStitchCommand() { @Test public void testAddSimpleStitchCommand() { - StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, sprite); + StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, sprite, Color.BLACK); command.act(workSpace, stream, null); - verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord)); + verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord), eq(Color.BLACK)); } @Test @@ -91,10 +93,10 @@ public void testActDuplicateStitchCommand() { when(workSpace.getCurrentY()).thenReturn(yCoord); when(workSpace.getLastSprite()).thenReturn(sprite); - StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, sprite); + StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, sprite, Color.BLACK); command.act(workSpace, stream, null); - verify(stream, Mockito.never()).addStitchPoint(anyFloat(), anyFloat()); + verify(stream, Mockito.never()).addStitchPoint(anyFloat(), anyFloat(), eq(Color.BLACK)); } @Test @@ -103,12 +105,12 @@ public void testSpriteTriggeredColorChange() { when(workSpace.getCurrentY()).thenReturn(0.0f); when(workSpace.getLastSprite()).thenReturn(sprite); - StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, mock(Sprite.class)); + StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, mock(Sprite.class), Color.BLACK); command.act(workSpace, stream, null); verify(stream, times(1)).addColorChange(); - verify(stream, times(2)).addStitchPoint(eq(0.0f), eq(0.0f)); - verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord)); + verify(stream, times(2)).addStitchPoint(eq(0.0f), eq(0.0f), eq(null)); + verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord), eq(Color.BLACK)); } @Test @@ -117,16 +119,16 @@ public void testLayerSwitchTriggeredColorChange() { pointList.add(mock(StitchPoint.class)); when(stream.getPointList()).thenReturn(pointList); - StitchCommand previousCommand = new DSTStitchCommand(1, 1, layer - 1, mock(Sprite.class)); - StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, mock(Sprite.class)); + StitchCommand previousCommand = new DSTStitchCommand(1, 1, layer - 1, mock(Sprite.class), Color.BLACK); + StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, mock(Sprite.class), Color.BLACK); command.act(workSpace, stream, previousCommand); InOrder inOrder = inOrder(stream); inOrder.verify(stream, times(1)).addColorChange(); - inOrder.verify(stream, times(1)).addStitchPoint(eq(1.0f), eq(1.0f)); + inOrder.verify(stream, times(1)).addStitchPoint(eq(1.0f), eq(1.0f), eq(Color.BLACK)); inOrder.verify(stream, times(1)).addJump(); - inOrder.verify(stream, times(2)).addStitchPoint(eq(1.0f), eq(1.0f)); - inOrder.verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord)); + inOrder.verify(stream, times(2)).addStitchPoint(eq(1.0f), eq(1.0f), eq(Color.BLACK)); + inOrder.verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord), eq(Color.BLACK)); } @Test @@ -134,22 +136,22 @@ public void testAddPreviousCommandOfSpriteOfOtherLayer() { ArrayList pointList = new ArrayList<>(); when(stream.getPointList()).thenReturn(pointList); - StitchCommand previousCommand = new DSTStitchCommand(1, 1, layer - 1, mock(Sprite.class)); - StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, mock(Sprite.class)); + StitchCommand previousCommand = new DSTStitchCommand(1, 1, layer - 1, mock(Sprite.class), Color.BLACK); + StitchCommand command = new DSTStitchCommand(xCoord, yCoord, layer, mock(Sprite.class), Color.BLACK); command.act(workSpace, stream, previousCommand); - verify(stream, times(1)).addStitchPoint(eq(1.0f), eq(1.0f)); - verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord)); + verify(stream, times(1)).addStitchPoint(eq(1.0f), eq(1.0f), eq(Color.BLACK)); + verify(stream, times(1)).addStitchPoint(eq(xCoord), eq(yCoord), eq(Color.BLACK)); } @Test public void testStitchCommandEquals() { Sprite sprite = new Sprite("firstSprite"); - StitchCommand command1 = new DSTStitchCommand(0, 0, 0, sprite); - StitchCommand command2 = new DSTStitchCommand(0, 1, 0, sprite); - StitchCommand command3 = new DSTStitchCommand(0, 0, 1, sprite); - StitchCommand command4 = new DSTStitchCommand(0, 0, 0, new Sprite("secondSprite")); - StitchCommand command5 = new DSTStitchCommand(0, 0, 0, sprite); + StitchCommand command1 = new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK); + StitchCommand command2 = new DSTStitchCommand(0, 1, 0, sprite, Color.BLACK); + StitchCommand command3 = new DSTStitchCommand(0, 0, 1, sprite, Color.BLACK); + StitchCommand command4 = new DSTStitchCommand(0, 0, 0, new Sprite("secondSprite"), Color.BLACK); + StitchCommand command5 = new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK); assertEquals(command1, command5); assertNotEquals(command1, command2); @@ -160,11 +162,11 @@ public void testStitchCommandEquals() { @Test public void testStitchCommandHashCode() { Sprite sprite = new Sprite("firstSprite"); - StitchCommand command1 = new DSTStitchCommand(0, 0, 0, sprite); - StitchCommand command2 = new DSTStitchCommand(0, 1, 0, sprite); - StitchCommand command3 = new DSTStitchCommand(0, 0, 1, sprite); - StitchCommand command4 = new DSTStitchCommand(0, 0, 0, new Sprite("secondSprite")); - StitchCommand command5 = new DSTStitchCommand(0, 0, 0, sprite); + StitchCommand command1 = new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK); + StitchCommand command2 = new DSTStitchCommand(0, 1, 0, sprite, Color.BLACK); + StitchCommand command3 = new DSTStitchCommand(0, 0, 1, sprite, Color.BLACK); + StitchCommand command4 = new DSTStitchCommand(0, 0, 0, new Sprite("secondSprite"), Color.BLACK); + StitchCommand command5 = new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK); assertEquals(command1.hashCode(), command5.hashCode()); assertNotEquals(command1.hashCode(), command2.hashCode()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchPointTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchPointTest.java index bb80a9a00a0..b878144b1b5 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchPointTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStitchPointTest.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.test.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.embroidery.DSTStitchPoint; import org.catrobat.catroid.embroidery.StitchPoint; import org.junit.Before; @@ -54,7 +56,7 @@ public void setUo() { @Test public void testisConnectingPoint() { - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); assertTrue(stitchPoint.isConnectingPoint()); assertFalse(stitchPoint.isColorChangePoint()); @@ -63,7 +65,7 @@ public void testisConnectingPoint() { @Test public void testJumpStitchPoint() { - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint.setJump(true); assertTrue(stitchPoint.isJumpPoint()); @@ -72,7 +74,7 @@ public void testJumpStitchPoint() { @Test public void testColorChangeStitchPoint() { - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint.setColorChange(true); assertTrue(stitchPoint.isColorChangePoint()); @@ -83,7 +85,7 @@ public void testColorChangeStitchPoint() { public void testStitchBytesZeroDifference() throws IOException { final byte[] expectedStitchBytes = new byte[] {0, 0, (byte) 0x3}; - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint.setRelativeCoordinatesToPreviousPoint(0, 0); stitchPoint.appendToStream(fileOutputStream); @@ -94,7 +96,7 @@ public void testStitchBytesZeroDifference() throws IOException { public void testStitchBytesDifference() throws IOException { final byte[] expectedStitchBytes = new byte[] {(byte) 0x5A, (byte) 0x5A, (byte) 0x03}; - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint.setRelativeCoordinatesToPreviousPoint(20, 20); stitchPoint.appendToStream(fileOutputStream); @@ -105,7 +107,7 @@ public void testStitchBytesDifference() throws IOException { public void testStitchBytesWithColorChange() throws IOException { final byte[] expectedStitchBytes = new byte[] {(byte) 0xA5, (byte) 0xA5, (byte) 0xC3}; - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint.setColorChange(true); stitchPoint.setRelativeCoordinatesToPreviousPoint(-20, -20); @@ -117,7 +119,7 @@ public void testStitchBytesWithColorChange() throws IOException { public void testStitchBytesWithJump() throws IOException { final byte[] expectedStitchBytes = new byte[] {(byte) 0xAA, (byte) 0xAA, (byte) 0x83}; - StitchPoint stitchPoint = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint.setJump(true); stitchPoint.setRelativeCoordinatesToPreviousPoint(20, -20); @@ -127,13 +129,13 @@ public void testStitchBytesWithJump() throws IOException { @Test public void testStitchPointsEquals() { - StitchPoint stitchPoint1 = new DSTStitchPoint(0, 0); - StitchPoint stitchPoint2 = new DSTStitchPoint(1, 1); - StitchPoint stitchPoint3 = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint1 = new DSTStitchPoint(0, 0, Color.BLACK); + StitchPoint stitchPoint2 = new DSTStitchPoint(1, 1, Color.BLACK); + StitchPoint stitchPoint3 = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint3.setColorChange(true); - StitchPoint stitchPoint4 = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint4 = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint4.setJump(true); - StitchPoint stitchPoint5 = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint5 = new DSTStitchPoint(0, 0, Color.BLACK); assertNotEquals(stitchPoint1, stitchPoint2); assertNotEquals(stitchPoint1, stitchPoint3); @@ -144,13 +146,13 @@ public void testStitchPointsEquals() { @Test public void testStitchPointsHashCode() { - StitchPoint stitchPoint1 = new DSTStitchPoint(1, 2); - StitchPoint stitchPoint2 = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint1 = new DSTStitchPoint(1, 2, Color.BLACK); + StitchPoint stitchPoint2 = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint2.setJump(true); - StitchPoint stitchPoint3 = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint3 = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint3.setColorChange(true); - StitchPoint stitchPoint4 = new DSTStitchPoint(2, 1); - StitchPoint stitchPoint5 = new DSTStitchPoint(1, 2); + StitchPoint stitchPoint4 = new DSTStitchPoint(2, 1, Color.BLACK); + StitchPoint stitchPoint5 = new DSTStitchPoint(1, 2, Color.BLACK); assertNotEquals(stitchPoint1.hashCode(), stitchPoint2.hashCode()); assertNotEquals(stitchPoint1.hashCode(), stitchPoint3.hashCode()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStreamTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStreamTest.java index 235c2b355b9..9a7c48fe433 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStreamTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTStreamTest.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.test.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.embroidery.DSTHeader; import org.catrobat.catroid.embroidery.DSTStitchPoint; import org.catrobat.catroid.embroidery.DSTStream; @@ -58,7 +60,7 @@ public void setUp() { @Test public void testAddJumpStitchPoint() { stream.addJump(); - stream.addStitchPoint(0, 0); + stream.addStitchPoint(0, 0, Color.BLACK); assertEquals(1, stream.getPointList().size()); assertTrue(stream.getPointList().get(0).isJumpPoint()); @@ -67,7 +69,7 @@ public void testAddJumpStitchPoint() { @Test public void testAddColorChangeStitchPoint() { stream.addColorChange(); - stream.addStitchPoint(0, 0); + stream.addStitchPoint(0, 0, Color.BLACK); assertEquals(1, stream.getPointList().size()); assertTrue(stream.getPointList().get(0).isColorChangePoint()); @@ -81,8 +83,8 @@ private boolean pointAtPositionEqualsCoordinates(int index, int x, int y) { @Test public void testInterpolatedStitchPoints() { - stream.addStitchPoint(0, 0); - stream.addStitchPoint(80, 80); + stream.addStitchPoint(0, 0, Color.BLACK); + stream.addStitchPoint(80, 80, Color.BLACK); assertEquals(5, stream.getPointList().size()); assertTrue(pointAtPositionEqualsCoordinates(0, 0, 0)); @@ -99,11 +101,11 @@ public void testInterpolatedStitchPoints() { @Test public void testAddAllStitchPoints() { - StitchPoint stitchPoint1 = new DSTStitchPoint(0, 0); + StitchPoint stitchPoint1 = new DSTStitchPoint(0, 0, Color.BLACK); stitchPoint1.setColorChange(true); - StitchPoint stitchPoint2 = new DSTStitchPoint(80, 80); + StitchPoint stitchPoint2 = new DSTStitchPoint(80, 80, Color.BLACK); stitchPoint2.setJump(true); - StitchPoint stitchPoint3 = new DSTStitchPoint(100, 100); + StitchPoint stitchPoint3 = new DSTStitchPoint(100, 100, Color.BLACK); ArrayList stitchPoints = new ArrayList<>(); stitchPoints.add(stitchPoint1); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/ExifDataTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/ExifDataTest.kt new file mode 100644 index 00000000000..bfea696b09a --- /dev/null +++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/ExifDataTest.kt @@ -0,0 +1,89 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2021 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package org.catrobat.catroid.test.utiltests + +import android.content.Context +import androidx.exifinterface.media.ExifInterface +import androidx.test.core.app.ApplicationProvider +import androidx.test.platform.app.InstrumentationRegistry +import org.catrobat.catroid.common.Constants +import org.catrobat.catroid.utils.Utils +import org.catrobat.paintroid.FileIO +import org.junit.After +import org.junit.Assert +import org.junit.Before +import org.junit.Test + +import java.io.File +import java.io.FileOutputStream +import java.io.OutputStream + +class ExifDataTest { + + companion object { + private const val IMAGE_NAME = "Exif.jpg" + private val CACHE_FOLDER = File(ApplicationProvider.getApplicationContext().cacheDir.absolutePath) + } + + private lateinit var cacheFile: File + + @Before + fun setUp() { + cacheFile = File(CACHE_FOLDER, IMAGE_NAME) + val originalImage = InstrumentationRegistry.getInstrumentation().context.assets.open(IMAGE_NAME) + val buf = ByteArray(originalImage.available()) + originalImage.read(buf) + val outputStream: OutputStream = FileOutputStream(cacheFile) + outputStream.write(buf) + } + + @After + fun tearDown() { + Assert.assertTrue(cacheFile.delete()) + } + + @Test + fun testRemoveExifData() { + var exif = ExifInterface(cacheFile.absolutePath) + Assert.assertFalse(exif.getAttribute(ExifInterface.TAG_ARTIST)!!.isEmpty()) + Assert.assertFalse(exif.getAttribute(ExifInterface.TAG_DATETIME)!!.isEmpty()) + + Utils.removeExifData(CACHE_FOLDER, IMAGE_NAME) + exif = ExifInterface(cacheFile.absolutePath) + + Constants.EXIFTAGS_FOR_EXIFREMOVER.forEach { exifTag -> + val tag = exif.getAttribute(exifTag) + Assert.assertTrue(tag == null || tag.isEmpty()) + } + } + + @Test + fun testPocketPaintExifInterfaceCall() { + val exif = ExifInterface(cacheFile.absolutePath) + Assert.assertEquals(0f, FileIO.getBitmapOrientation(exif)) + exif.setAttribute(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_ROTATE_180.toString()) + exif.saveAttributes() + Assert.assertEquals(180f, FileIO.getBitmapOrientation(exif)) + } +} diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/RemoveExifDataTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/RemoveExifDataTest.java deleted file mode 100644 index 812139ef164..00000000000 --- a/catroid/src/androidTest/java/org/catrobat/catroid/test/utiltests/RemoveExifDataTest.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2020 The Catrobat Team - * () - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * An additional term exception under section 7 of the GNU Affero - * General Public License, version 3, is available at - * http://developer.catrobat.org/license_additional_term - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.catrobat.catroid.test.utiltests; - -import org.catrobat.catroid.utils.Utils; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import androidx.exifinterface.media.ExifInterface; -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.platform.app.InstrumentationRegistry; - -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - -import static org.catrobat.catroid.common.Constants.EXIFTAGS_FOR_EXIFREMOVER; - -@RunWith(AndroidJUnit4.class) -public class RemoveExifDataTest { - - private static final String IMAGE_NAME = "Exif.jpg"; - private static final String CACHE_FOLDER = - ApplicationProvider.getApplicationContext().getCacheDir().getAbsolutePath(); - - @Test - public void testRemoveExifData() throws IOException { - InputStream originalImage = - InstrumentationRegistry.getInstrumentation().getContext().getAssets().open(IMAGE_NAME); - - File cacheFolderFile = new File(CACHE_FOLDER); - File cacheFile = new File(cacheFolderFile, IMAGE_NAME); - byte[] buf = new byte[originalImage.available()]; - originalImage.read(buf); - OutputStream outputStream = new FileOutputStream(cacheFile); - outputStream.write(buf); - - ExifInterface exif = new ExifInterface(cacheFile.getAbsolutePath()); - - assertFalse(exif.getAttribute(ExifInterface.TAG_ARTIST).isEmpty()); - assertFalse(exif.getAttribute(ExifInterface.TAG_DATETIME).isEmpty()); - - Utils.removeExifData(cacheFolderFile, IMAGE_NAME); - - exif = new ExifInterface(cacheFile.getAbsolutePath()); - for (String exifTag: EXIFTAGS_FOR_EXIFREMOVER) { - String tag = exif.getAttribute(exifTag); - assertTrue(tag == null || tag.isEmpty()); - } - - cacheFile.delete(); - } -} diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java index 19ca24e67da..f8f2194f609 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/app/EmptyEventBrickTest.java @@ -23,16 +23,18 @@ package org.catrobat.catroid.uiespresso.content.brick.app; -import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.content.EmptyScript; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; +import org.catrobat.catroid.content.bricks.Brick; import org.catrobat.catroid.content.bricks.DeleteLookBrick; +import org.catrobat.catroid.content.bricks.ShowBrick; +import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.testsuites.annotations.Cat; import org.catrobat.catroid.testsuites.annotations.Level; -import org.catrobat.catroid.ui.SpriteActivity; -import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule; +import org.catrobat.catroid.ui.ProjectListActivity; +import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,38 +44,56 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import static junit.framework.Assert.assertFalse; + import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withText; @RunWith(AndroidJUnit4.class) public class EmptyEventBrickTest { + private static final String PROJECT_NAME = "testEmptyEventBrick"; + private static final String SPRITE_NAME = "testSprite"; + private Project project; @Rule - public FragmentActivityTestRule baseActivityTestRule = new - FragmentActivityTestRule<>(SpriteActivity.class, SpriteActivity.EXTRA_FRAGMENT_POSITION, SpriteActivity.FRAGMENT_SCRIPTS); + public BaseActivityTestRule baseActivityTestRule = new + BaseActivityTestRule<>(ProjectListActivity.class, true, false); @Before public void setUp() throws Exception { - Project project = new Project(ApplicationProvider.getApplicationContext(), - "testEmptyEventBrick"); - Sprite sprite = new Sprite("testSprite"); + project = new Project(ApplicationProvider.getApplicationContext(), + PROJECT_NAME); + Sprite sprite = new Sprite(SPRITE_NAME); Script script = new EmptyScript(); + script.addBrick(new ShowBrick()); script.addBrick(new DeleteLookBrick()); - sprite.addScript(script); project.getDefaultScene().addSprite(sprite); - ProjectManager.getInstance().setCurrentProject(project); - ProjectManager.getInstance().setCurrentSprite(sprite); - ProjectManager.getInstance().setCurrentlyEditedScene(project.getDefaultScene()); + XstreamSerializer.getInstance().saveProject(project); - baseActivityTestRule.launchActivity(); + baseActivityTestRule.launchActivity(null); } @Category({Cat.AppUi.class, Level.Detailed.class}) @Test public void testIsEmptyBrickShownInScripts() { + onView(withText(PROJECT_NAME)).perform(click()); + onView(withText(SPRITE_NAME)).perform(click()); onBrickAtPosition(0).check(matches(isDisplayed())); } + + @Category({Cat.AppUi.class, Level.Detailed.class}) + @Test + public void testBelowBricksAreNotDisabled() { + onView(withText(PROJECT_NAME)).perform(click()); + onView(withText(SPRITE_NAME)).perform(click()); + for (Brick brick : project.getDefaultScene().getSprite(SPRITE_NAME).getAllBricks()) { + assertFalse(brick.isCommentedOut()); + } + } } diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java index b2b330b8e54..440726f2b9c 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorUndoTest.java @@ -49,9 +49,9 @@ import static org.catrobat.catroid.uiespresso.content.brick.utils.ColorPickerInteractionWrapper.onColorPickerPresetButton; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorDataListWrapper.onDataList; import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.onFormulaEditor; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static androidx.test.espresso.Espresso.closeSoftKeyboard; import static androidx.test.espresso.Espresso.onView; @@ -72,6 +72,7 @@ public class FormulaEditorUndoTest { private static final String NEW_VARIABLE_NAME = "NewVariable"; private static final int VARIABLE_VALUE = 5; private static final String NEW_VARIABLE_VALUE = "10"; + UserVariable userVariable; @Rule public FragmentActivityTestRule baseActivityTestRule = new @@ -87,7 +88,7 @@ public void setUp() throws Exception { brickPosition = 1; Script script = BrickTestUtils.createProjectAndGetStartScript(FormulaEditorUndoTest.class.getName()); script.addBrick(new PlaceAtBrick()); - UserVariable userVariable = new UserVariable(VARIABLE_NAME, VARIABLE_VALUE); + userVariable = new UserVariable(VARIABLE_NAME, VARIABLE_VALUE); ProjectManager.getInstance().getCurrentProject().addUserVariable(userVariable); script.addBrick(new SetVariableBrick(new Formula(0), userVariable)); baseActivityTestRule.launchActivity(); @@ -280,7 +281,8 @@ public void testUndoFormulaDeleteVariable() { assertNotNull(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME)); - assertTrue(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue().equals(VARIABLE_VALUE)); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME), userVariable); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue(), VARIABLE_VALUE); } @Category({Cat.AppUi.class, Level.Smoke.class}) @@ -309,16 +311,19 @@ public void testUndoFormulaRenameVariable() { assertNull(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME)); assertNotNull(ProjectManager.getInstance().getCurrentProject().getUserVariable(NEW_VARIABLE_NAME)); - assertTrue(ProjectManager.getInstance().getCurrentProject().getUserVariable(NEW_VARIABLE_NAME).getValue().equals(VARIABLE_VALUE)); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(NEW_VARIABLE_NAME), userVariable); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(NEW_VARIABLE_NAME).getValue(), VARIABLE_VALUE); onView(withId(R.id.menu_undo)) .perform(click()); + userVariable.setName(VARIABLE_NAME); onView(withId(R.id.menu_undo)) .check(doesNotExist()); assertNull(ProjectManager.getInstance().getCurrentProject().getUserVariable(NEW_VARIABLE_NAME)); assertNotNull(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME)); - assertTrue(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue().equals(VARIABLE_VALUE)); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME), userVariable); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue(), VARIABLE_VALUE); } @Category({Cat.AppUi.class, Level.Smoke.class}) @@ -345,14 +350,16 @@ public void testUndoFormulaEditVariable() { onView(withId(R.id.menu_undo)) .check(matches(isDisplayed())); - assertTrue(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue().equals(NEW_VARIABLE_VALUE)); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME), userVariable); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue(), NEW_VARIABLE_VALUE); onView(withId(R.id.menu_undo)) .perform(click()); onView(withId(R.id.menu_undo)) .check(doesNotExist()); - assertTrue(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue().equals(VARIABLE_VALUE)); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME), userVariable); + assertEquals(ProjectManager.getInstance().getCurrentProject().getUserVariable(VARIABLE_NAME).getValue(), VARIABLE_VALUE); } @Category({Cat.AppUi.class, Level.Smoke.class}) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/SpriteFromGalleryIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/SpriteFromGalleryIntentTest.java index 2891afbc042..f427f8003dd 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/SpriteFromGalleryIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/gallery/SpriteFromGalleryIntentTest.java @@ -29,6 +29,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Environment; +import android.preference.PreferenceManager; import android.util.Log; import org.catrobat.catroid.ProjectManager; @@ -60,6 +61,7 @@ import androidx.test.rule.GrantPermissionRule; import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY; +import static org.catrobat.catroid.common.SharedPreferenceKeys.NEW_SPRITE_VISUAL_PLACEMENT_KEY; import static org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView; import static org.catrobat.catroid.uiespresso.util.matchers.BundleMatchers.bundleHasExtraIntent; import static org.catrobat.catroid.uiespresso.util.matchers.BundleMatchers.bundleHasMatchingString; @@ -134,6 +136,9 @@ public void setUp() throws Exception { @After public void tearDown() throws IOException { Intents.release(); + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()).edit() + .remove(NEW_SPRITE_VISUAL_PLACEMENT_KEY) + .apply(); baseActivityTestRule.finishActivity(); StorageOperations.deleteDir(tmpPath); try { @@ -146,6 +151,10 @@ public void tearDown() throws IOException { @Category({Cat.AppUi.class, Level.Smoke.class}) @Test public void testSpriteFromGalleryIntentTest() { + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()).edit() + .putBoolean(NEW_SPRITE_VISUAL_PLACEMENT_KEY, false) + .commit(); + onView(withId(R.id.button_add)) .perform(click()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewSpriteIntentTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewSpriteIntentTest.java index 3b30c01e8aa..d1f1512c964 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewSpriteIntentTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/looks/paintroid/PocketPaintNewSpriteIntentTest.java @@ -25,6 +25,7 @@ import android.app.Activity; import android.app.Instrumentation; +import android.preference.PreferenceManager; import android.util.Log; import org.catrobat.catroid.ProjectManager; @@ -56,6 +57,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY; +import static org.catrobat.catroid.common.SharedPreferenceKeys.NEW_SPRITE_VISUAL_PLACEMENT_KEY; import static org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @@ -64,6 +66,7 @@ import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.Espresso.closeSoftKeyboard; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.intent.Intents.intended; import static androidx.test.espresso.intent.Intents.intending; @@ -105,6 +108,10 @@ public void setUp() throws Exception { @After public void tearDown() { Intents.release(); + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()).edit() + .remove(NEW_SPRITE_VISUAL_PLACEMENT_KEY) + .apply(); + baseActivityTestRule.finishActivity(); try { StorageOperations.deleteDir(new File(DEFAULT_ROOT_DIRECTORY, projectName)); @@ -118,6 +125,10 @@ public void tearDown() { public void testAddNewSprite() { String newSpriteName = UiTestUtils.getResourcesString(R.string.default_sprite_name) + " (1)"; + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()).edit() + .putBoolean(NEW_SPRITE_VISUAL_PLACEMENT_KEY, false) + .commit(); + onView(withId(R.id.button_add)) .perform(click()); @@ -129,6 +140,8 @@ public void testAddNewSprite() { onView(withText(newSpriteName)) .check(matches(isDisplayed())); + closeSoftKeyboard(); + onView(Matchers.allOf(withId(android.R.id.button1), withText(R.string.ok))) .perform(click()); diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java new file mode 100644 index 00000000000..60ba892393f --- /dev/null +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/DisableHintDialogTest.java @@ -0,0 +1,192 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2021 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package org.catrobat.catroid.uiespresso.ui.dialog; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; + +import org.catrobat.catroid.R; +import org.catrobat.catroid.common.Constants; +import org.catrobat.catroid.content.Project; +import org.catrobat.catroid.io.asynctask.ProjectSaveTask; +import org.catrobat.catroid.testsuites.annotations.Cat; +import org.catrobat.catroid.testsuites.annotations.Level; +import org.catrobat.catroid.ui.MainMenuActivity; +import org.catrobat.catroid.ui.settingsfragments.SettingsFragment; +import org.catrobat.catroid.uiespresso.util.UiTestUtils; +import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; +import org.catrobat.catroid.utils.SnackbarUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +import java.util.HashSet; +import java.util.Set; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.espresso.matcher.PreferenceMatchers; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; + +import static org.catrobat.catroid.R.id.currentProjectLayout; +import static org.catrobat.catroid.common.SharedPreferenceKeys.AGREED_TO_PRIVACY_POLICY_VERSION; +import static org.catrobat.catroid.common.SharedPreferenceKeys.DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY; +import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_HINTS; + +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu; +import static androidx.test.espresso.Espresso.pressBack; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; + +@RunWith(AndroidJUnit4.class) +public class DisableHintDialogTest { + + private boolean hintSetting; + private Set hintList; + int bufferedPreferenceSetting; + + @Rule + public BaseActivityTestRule baseActivityTestRule = new + BaseActivityTestRule<>(MainMenuActivity.class, false, false); + + @Before + public void setUp() throws Exception { + createProject("firstProject"); + + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()); + hintSetting = sharedPreferences.getBoolean(SettingsFragment.SETTINGS_SHOW_HINTS, false); + hintList = new HashSet<>(sharedPreferences.getStringSet(SnackbarUtil.SHOWN_HINT_LIST, new HashSet())); + bufferedPreferenceSetting = sharedPreferences.getInt(AGREED_TO_PRIVACY_POLICY_VERSION, 0); + + getDefaultSharedPreferences() + .edit() + .putBoolean(SETTINGS_SHOW_HINTS, true) + .putStringSet(SnackbarUtil.SHOWN_HINT_LIST, new HashSet()) + .putBoolean(DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY, false) + .putInt(AGREED_TO_PRIVACY_POLICY_VERSION, Constants.CATROBAT_TERMS_OF_USE_ACCEPTED) + .apply(); + + baseActivityTestRule.launchActivity(null); + } + + @After + public void tearDown() throws Exception { + baseActivityTestRule.deleteAllProjects(); + + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()) + .edit() + .putBoolean(SETTINGS_SHOW_HINTS, hintSetting) + .putStringSet(SnackbarUtil.SHOWN_HINT_LIST, hintList) + .putBoolean(DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY, true) + .putInt(AGREED_TO_PRIVACY_POLICY_VERSION, bufferedPreferenceSetting) + .apply(); + } + + @Category({Cat.AppUi.class, Level.Smoke.class}) + @Test + public void disableHintDialogTest() { + onView(withId(currentProjectLayout)).perform(click()); + + onView(withText(R.string.dialog_disable_hints_title)) + .check(matches(isDisplayed())); + + onView(withText(R.string.dialog_disable_hints_text)) + .check(matches(isDisplayed())); + + onView(withText(R.string.dialog_disable_hints_button_hide)).perform(click()); + + pressBack(); + + openActionBarOverflowOrOptionsMenu(baseActivityTestRule.getActivity()); + onView(withText(R.string.settings)).perform(click()); + checkPreferenceHide(R.string.preference_title_enable_hints, SETTINGS_SHOW_HINTS); + + pressBack(); + } + + @Category({Cat.AppUi.class, Level.Smoke.class}) + @Test + public void enableHintDialogTest() { + onView(withId(currentProjectLayout)).perform(click()); + + onView(withText(R.string.dialog_disable_hints_title)) + .check(matches(isDisplayed())); + + onView(withText(R.string.dialog_disable_hints_text)) + .check(matches(isDisplayed())); + + onView(withText(R.string.dialog_disable_hints_button_show)).perform(click()); + + pressBack(); + + openActionBarOverflowOrOptionsMenu(baseActivityTestRule.getActivity()); + onView(withText(R.string.settings)).perform(click()); + checkPreferenceShow(R.string.preference_title_enable_hints, SETTINGS_SHOW_HINTS); + + pressBack(); + } + + private void createProject(String projectName) { + Project project = UiTestUtils.createEmptyProject(projectName); + ProjectSaveTask.task(project, ApplicationProvider.getApplicationContext()); + } + + private SharedPreferences getDefaultSharedPreferences() { + return PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()); + } + + private void checkPreferenceHide(int displayedTitleResourceString, String sharedPreferenceTag) { + SharedPreferences sharedPreferences = PreferenceManager + .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()); + + assertFalse(sharedPreferences.getBoolean(sharedPreferenceTag, false)); + + onData(PreferenceMatchers.withTitle(displayedTitleResourceString)) + .perform(click()); + + assertTrue(sharedPreferences.getBoolean(sharedPreferenceTag, true)); + } + + private void checkPreferenceShow(int displayedTitleResourceString, String sharedPreferenceTag) { + SharedPreferences sharedPreferences = PreferenceManager + .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()); + + assertTrue(sharedPreferences.getBoolean(sharedPreferenceTag, true)); + + onData(PreferenceMatchers.withTitle(displayedTitleResourceString)) + .perform(click()); + + assertFalse(sharedPreferences.getBoolean(sharedPreferenceTag, false)); + } +} diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/NewSpriteVisuallyPlaceDialogTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/NewSpriteVisuallyPlaceDialogTest.kt new file mode 100644 index 00000000000..3053694df7b --- /dev/null +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/NewSpriteVisuallyPlaceDialogTest.kt @@ -0,0 +1,179 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2021 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.catrobat.catroid.uiespresso.ui.dialog + +import android.app.Activity +import android.app.Instrumentation.ActivityResult +import android.content.Intent +import android.preference.PreferenceManager.getDefaultSharedPreferences +import androidx.test.core.app.ApplicationProvider +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.Espresso.pressBack +import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.Espresso.closeSoftKeyboard +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.Intents.intended +import androidx.test.espresso.intent.matcher.IntentMatchers +import androidx.test.espresso.matcher.ViewMatchers.isChecked +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.isNotChecked +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.catrobat.catroid.ProjectManager +import org.catrobat.catroid.R +import org.catrobat.catroid.WaitForConditionAction.Companion.waitFor +import org.catrobat.catroid.common.Constants +import org.catrobat.catroid.common.SharedPreferenceKeys.NEW_SPRITE_VISUAL_PLACEMENT_KEY +import org.catrobat.catroid.content.Project +import org.catrobat.catroid.io.XstreamSerializer +import org.catrobat.catroid.test.utils.TestUtils +import org.catrobat.catroid.testsuites.annotations.Cat.AppUi +import org.catrobat.catroid.testsuites.annotations.Level.Smoke +import org.catrobat.catroid.ui.ProjectActivity +import org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition +import org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView +import org.catrobat.catroid.uiespresso.util.UiTestUtils +import org.catrobat.catroid.uiespresso.util.rules.FragmentActivityTestRule +import org.hamcrest.CoreMatchers.allOf +import org.hamcrest.Matcher +import org.hamcrest.Matchers +import org.hamcrest.core.AllOf +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.experimental.categories.Category +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class NewSpriteVisuallyPlaceDialogTest { + @get:Rule + var baseActivityTestRule = FragmentActivityTestRule( + ProjectActivity::class.java, ProjectActivity.EXTRA_FRAGMENT_POSITION, + ProjectActivity.FRAGMENT_SPRITES + ) + private val projectName = "newProject" + private lateinit var expectedIntent: Matcher + val newSpriteName = UiTestUtils.getResourcesString(R.string.default_sprite_name).toString() + " (1)" + + @Before + @Throws(Exception::class) + fun setUp() { + createProject(projectName) + getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())?.edit() + ?.putBoolean(NEW_SPRITE_VISUAL_PLACEMENT_KEY, true) + ?.apply() + baseActivityTestRule.launchActivity() + Intents.init() + + expectedIntent = AllOf.allOf( + IntentMatchers.hasComponent(Constants.POCKET_PAINT_INTENT_ACTIVITY_NAME), + IntentMatchers.hasAction("android.intent.action.MAIN"), + IntentMatchers.hasCategories(Matchers.hasItem(Matchers.equalTo("android.intent.category.LAUNCHER"))) + ) + + val result = ActivityResult(Activity.RESULT_OK, null) + Intents.intending(expectedIntent).respondWith(result) + + baseActivityTestRule.launchActivity(null) + + onView(withId(R.id.button_add)) + .perform(click()) + onView(withId(R.id.dialog_new_look_paintroid)) + .perform(click()) + intended(expectedIntent) + closeSoftKeyboard() + onView(withId(R.id.place_visually_sprite_switch)) + .perform(waitFor(isDisplayed(), 1000)) + onView(withId(R.id.place_visually_sprite_switch)) + .check(matches(isChecked())) + } + + @After + fun tearDown() { + Intents.release() + getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())?.edit() + ?.remove(NEW_SPRITE_VISUAL_PLACEMENT_KEY) + ?.apply() + TestUtils.deleteProjects(projectName) + } + + @Category(AppUi::class, Smoke::class) + @Test + fun newSpriteVisuallyPlaced() { + onView(withText(R.string.place_visually_text)) + .check(matches(isDisplayed())) + + onView(allOf(withId(android.R.id.button1), withText(R.string.ok))) + .perform(click()) + onView(withId(R.id.confirm)).perform(click()) + onRecyclerView().performOnItemWithText(newSpriteName, click()) + + onBrickAtPosition(0).checkShowsText(R.string.brick_when_started) + onBrickAtPosition(1).checkShowsText(R.string.brick_place_at) + onBrickAtPosition(1).onChildView(withId(R.id.brick_place_at_edit_text_x)) + .check(matches(withText("100 "))) + onBrickAtPosition(1).onFormulaTextField(R.id.brick_place_at_edit_text_y) + .check(matches(withText("200 "))) + } + + @Category(AppUi::class, Smoke::class) + @Test + fun newSpriteCancelVisuallyPlacing() { + onView(allOf(withId(android.R.id.button1), withText(R.string.ok))) + .perform(click()) + pressBack() + onRecyclerView().performOnItemWithText(newSpriteName, click()) + onView(withText(R.string.fragment_script_text_description)) + .check(matches(isDisplayed())) + } + + @Category(AppUi::class, Smoke::class) + @Test + fun newSpriteCheckVisualPlacementSettingRetained() { + onView(withId(R.id.place_visually_sprite_switch)) + .perform(click()) + onView(allOf(withId(android.R.id.button1), withText(R.string.ok))) + .perform(click()) + + onView(withId(R.id.button_add)) + .perform(click()) + onView(withId(R.id.dialog_new_look_paintroid)) + .perform(click()) + intended(expectedIntent, Intents.times(2)) + closeSoftKeyboard() + onView(withId(R.id.place_visually_sprite_switch)) + .perform(waitFor(isDisplayed(), 1000)) + onView(withId(R.id.place_visually_sprite_switch)) + .check(matches(isNotChecked())) + } + + private fun createProject(projectName: String) { + val project = Project(ApplicationProvider.getApplicationContext(), projectName) + ProjectManager.getInstance().currentProject = project + ProjectManager.getInstance().currentlyEditedScene = project.defaultScene + XstreamSerializer.getInstance().saveProject(project) + } +} diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/ReuploadProjectDialogTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/ReuploadProjectDialogTest.kt new file mode 100644 index 00000000000..1e815e4689b --- /dev/null +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/ReuploadProjectDialogTest.kt @@ -0,0 +1,132 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2021 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.catrobat.catroid.uiespresso.ui.dialog + +import android.content.Intent +import androidx.test.core.app.ApplicationProvider +import androidx.test.espresso.Espresso +import androidx.test.espresso.action.ViewActions +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.ViewMatchers +import org.catrobat.catroid.ProjectManager +import org.catrobat.catroid.R +import org.catrobat.catroid.content.Project +import org.catrobat.catroid.content.Scene +import org.catrobat.catroid.content.Script +import org.catrobat.catroid.content.Sprite +import org.catrobat.catroid.content.StartScript +import org.catrobat.catroid.formulaeditor.UserVariable +import org.catrobat.catroid.io.XstreamSerializer +import org.catrobat.catroid.io.asynctask.ProjectSaveTask +import org.catrobat.catroid.ui.ProjectUploadActivity +import org.catrobat.catroid.uiespresso.ui.activity.ProjectUploadRatingDialogTest.ProjectUploadTestActivity +import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule +import org.junit.After +import org.junit.Rule +import org.junit.Test + +class ReuploadProjectDialogTest { + @get:Rule + var activityTestRule = BaseActivityTestRule( + ProjectUploadTestActivity::class.java, false, false + ) + + var dummyProject: Project? = null + var projectName = "reuploadedProject" + + fun createDownloadedProject(name: String?) { + dummyProject = Project( + ApplicationProvider.getApplicationContext(), + name + ) + val dummyScene = Scene("scene", dummyProject!!) + ProjectManager.getInstance().currentProject = dummyProject + val sprite = Sprite("sprite") + val firstScript: Script = StartScript() + dummyScene.addSprite(sprite) + sprite.addScript(firstScript) + dummyProject!!.addScene(dummyScene) + ProjectSaveTask.task(dummyProject, ApplicationProvider.getApplicationContext()) + val intent = Intent() + intent.putExtra(ProjectUploadActivity.PROJECT_DIR, dummyProject!!.directory) + activityTestRule.launchActivity(intent) + } + + @After + @Throws(Exception::class) + fun tearDown() { + ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) + } + + @Test + fun showUploadWarningForUnchangedProjectTest() { + ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) + ProjectManager.getInstance().addNewDownloadedProject(projectName) + createDownloadedProject(projectName) + Espresso.onView(ViewMatchers.withText(R.string.warning)) + .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) + Espresso.onView(ViewMatchers.withText(R.string.ok)).perform(ViewActions.click()) + } + + @Test + fun notShowUploadWarningForChangedProjectTest() { + ProjectManager.getInstance().loadDownloadedProjects() + ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) + ProjectManager.getInstance().addNewDownloadedProject(projectName) + createDownloadedProject(projectName) + Espresso.onView(ViewMatchers.withText(R.string.warning)) + .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) + Espresso.onView(ViewMatchers.withText(R.string.ok)).perform(ViewActions.click()) + val currentProject = ProjectManager.getInstance().currentProject + val newScene = Scene("scene", currentProject) + currentProject.addScene(newScene) + XstreamSerializer.getInstance().saveProject(currentProject) + ProjectSaveTask.task(currentProject, ApplicationProvider.getApplicationContext()) + val intent = Intent() + intent.putExtra(ProjectUploadActivity.PROJECT_DIR, currentProject.directory) + activityTestRule.launchActivity(intent) + Espresso.onView(ViewMatchers.withText(R.string.main_menu_upload)) + .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) + } + + @Test + fun notShowUploadWarningForAddedVariableProjectTest() { + ProjectManager.getInstance().loadDownloadedProjects() + ProjectManager.getInstance().deleteDownloadedProjectInformation(projectName) + ProjectManager.getInstance().addNewDownloadedProject(projectName) + createDownloadedProject(projectName) + Espresso.onView(ViewMatchers.withText(R.string.warning)) + .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) + Espresso.onView(ViewMatchers.withText(R.string.ok)).perform(ViewActions.click()) + val currentProject = ProjectManager.getInstance().currentProject + val userVariable = UserVariable("uservariable") + currentProject.addUserVariable(userVariable) + XstreamSerializer.getInstance().saveProject(currentProject) + ProjectSaveTask.task(currentProject, ApplicationProvider.getApplicationContext()) + val intent = Intent() + intent.putExtra(ProjectUploadActivity.PROJECT_DIR, currentProject.directory) + activityTestRule.launchActivity(intent) + Espresso.onView(ViewMatchers.withText(R.string.main_menu_upload)) + .check(ViewAssertions.matches(ViewMatchers.isDisplayed())) + } +} diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentExplanationTextNoObjectsProjectTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentExplanationTextNoObjectsProjectTest.java index c6719b9d1f3..f73463b9dae 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentExplanationTextNoObjectsProjectTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/SpriteListFragmentExplanationTextNoObjectsProjectTest.java @@ -24,6 +24,7 @@ package org.catrobat.catroid.uiespresso.ui.fragment; import android.app.Activity; +import android.preference.PreferenceManager; import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; @@ -39,11 +40,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; +import static org.catrobat.catroid.common.SharedPreferenceKeys.NEW_SPRITE_VISUAL_PLACEMENT_KEY; import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.IsNot.not; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.Espresso.closeSoftKeyboard; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.withId; @@ -73,6 +76,11 @@ public void testEmptyViewOnStart() { public void testAddSprite() { onView(withId(R.id.empty_view)) .check(matches(isDisplayed())); + + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()).edit() + .putBoolean(NEW_SPRITE_VISUAL_PLACEMENT_KEY, false) + .commit(); + onView(withText(R.string.fragment_sprite_text_description)) .check(matches(isDisplayed())); @@ -84,6 +92,8 @@ public void run() { } }); + closeSoftKeyboard(); + onView(allOf(withId(android.R.id.button1), withText(R.string.ok))) .perform(click()); @@ -91,6 +101,10 @@ public void run() { .check(matches(not(isDisplayed()))); onView(withText(R.string.fragment_sprite_text_description)) .check(matches(not(isDisplayed()))); + + PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()).edit() + .remove(NEW_SPRITE_VISUAL_PLACEMENT_KEY) + .apply(); } private void createNoObjectsProject() { diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/Android9SnackbarRegressionTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/Android9SnackbarRegressionTest.java index 4142f09c6a0..2fdce6beba2 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/Android9SnackbarRegressionTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/hints/Android9SnackbarRegressionTest.java @@ -49,6 +49,7 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import static org.catrobat.catroid.common.SharedPreferenceKeys.DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY; import static org.hamcrest.core.AllOf.allOf; import static androidx.test.espresso.Espresso.onView; @@ -79,6 +80,7 @@ public void setUp() { sharedPreferences.edit() .putBoolean(SettingsFragment.SETTINGS_SHOW_HINTS, true) .putStringSet(SnackbarUtil.SHOWN_HINT_LIST, new HashSet()) + .putBoolean(DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY, true) .commit(); createProject(); diff --git a/catroid/src/main/java/org/catrobat/catroid/ProjectManager.java b/catroid/src/main/java/org/catrobat/catroid/ProjectManager.java index 360dadd7baa..76b209b8191 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ProjectManager.java +++ b/catroid/src/main/java/org/catrobat/catroid/ProjectManager.java @@ -23,8 +23,13 @@ package org.catrobat.catroid; import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; import android.util.Log; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + import org.catrobat.catroid.common.DefaultProjectHandler; import org.catrobat.catroid.common.LookData; import org.catrobat.catroid.common.ScreenModes; @@ -58,7 +63,9 @@ import java.io.File; import java.io.IOException; +import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -77,6 +84,8 @@ public final class ProjectManager { private Scene currentlyPlayingScene; private Scene startScene; private Sprite currentSprite; + private HashMap downloadedProjects; + private final String downloadedProjectsName = "downloaded_projects"; private Context applicationContext; @@ -88,6 +97,7 @@ public ProjectManager(Context applicationContext) { this.applicationContext = applicationContext; if (instance == null) { instance = this; + loadDownloadedProjects(); } } @@ -556,4 +566,76 @@ public void setCurrentlyEditedScene(Scene scene) { currentlyEditedScene = scene; currentlyPlayingScene = scene; } + + public void addNewDownloadedProject(String projectName) { + Boolean flag = downloadedProjects.get(projectName); + if (flag == null || flag) { + downloadedProjects.put(projectName, false); + saveDownloadedProjects(); + } + } + + public void resetChangedFlag(Project project) { + String projectName = project.getName(); + Boolean isChanged = downloadedProjects.get(projectName); + if (isChanged != null && isChanged) { + downloadedProjects.put(projectName, false); + saveDownloadedProjects(); + } + } + + public boolean isChangedProject(Project project) { + String projectName = project.getName(); + Boolean isChanged = downloadedProjects.get(projectName); + if (isChanged == null) { + return true; + } + return isChanged; + } + + public void deleteDownloadedProjectInformation(String projectName) { + downloadedProjects.remove(projectName); + } + + public void changedProject(String projectName) { + Boolean isChanged = downloadedProjects.get(projectName); + if (isChanged != null && !isChanged) { + downloadedProjects.put(projectName, true); + saveDownloadedProjects(); + } + } + + public void saveDownloadedProjects() { + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext); + SharedPreferences.Editor editor = sharedPreferences.edit(); + Gson gson = new Gson(); + String json = gson.toJson(downloadedProjects); + editor.putString(downloadedProjectsName, json); + editor.apply(); + } + + public void loadDownloadedProjects() { + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext); + Gson gson = new Gson(); + String json = null; + if (sharedPreferences != null) { + json = sharedPreferences.getString(downloadedProjectsName, null); + if (json != null) { + Type type = new TypeToken>() { + }.getType(); + downloadedProjects = gson.fromJson(json, type); + } else { + downloadedProjects = new HashMap<>(); + } + } + } + + public void moveChangedFlag(String source, String destination) { + Boolean value = downloadedProjects.get(source); + if (null != value) { + downloadedProjects.remove(source); + downloadedProjects.put(destination, true); + saveDownloadedProjects(); + } + } } diff --git a/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java b/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java index 6cb23964476..f7219046891 100644 --- a/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java +++ b/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java @@ -180,6 +180,7 @@ public final class BrickValues { public static final int STITCH_LENGTH = 10; public static final int ZIGZAG_STITCH_LENGTH = 2; public static final int ZIGZAG_STITCH_WIDTH = 10; + public static final String THREAD_COLOR = "#ff0000"; //Constants Device public static final double TOUCH_DURATION = 0.3; diff --git a/catroid/src/main/java/org/catrobat/catroid/common/Constants.java b/catroid/src/main/java/org/catrobat/catroid/common/Constants.java index 4eacb03caa3..0eda86eb5f2 100644 --- a/catroid/src/main/java/org/catrobat/catroid/common/Constants.java +++ b/catroid/src/main/java/org/catrobat/catroid/common/Constants.java @@ -42,7 +42,7 @@ public final class Constants { - public static final double CURRENT_CATROBAT_LANGUAGE_VERSION = 1.01; + public static final double CURRENT_CATROBAT_LANGUAGE_VERSION = 1.03; public static final String REMOTE_DISPLAY_APP_ID = "CEBB9229"; public static final int CAST_CONNECTION_TIMEOUT = 5000; //in milliseconds public static final int CAST_NOT_SEEING_DEVICE_TIMEOUT = 3000; //in milliseconds @@ -147,6 +147,7 @@ public final class Constants { public static final int CATROBAT_TERMS_OF_USE_ACCEPTED = 1; public static final String PLAY_STORE_PAGE_LINK = "https://play.google.com/store/apps/details?id="; + public static final String HUAWEI_APP_GALLERY_LINK = "https://catrob.at/HuaweiAppGallery"; public static final String USERNAME_COOKIE_NAME = "CATRO_LOGIN_USER"; public static final String TOKEN_COOKIE_NAME = "CATRO_LOGIN_TOKEN"; diff --git a/catroid/src/main/java/org/catrobat/catroid/common/SharedPreferenceKeys.java b/catroid/src/main/java/org/catrobat/catroid/common/SharedPreferenceKeys.java index 1b79d52e985..69e96d61c4f 100644 --- a/catroid/src/main/java/org/catrobat/catroid/common/SharedPreferenceKeys.java +++ b/catroid/src/main/java/org/catrobat/catroid/common/SharedPreferenceKeys.java @@ -50,6 +50,9 @@ private SharedPreferenceKeys() { public static final String SORT_PROJECTS_PREFERENCE_KEY = "sortProjectsList"; + public static final String DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY = + "disableHintsDialogShown"; + public static final String SCRATCH_CONVERTER_CLIENT_ID_PREFERENCE_KEY = "scratchconverter.clientID"; public static final String SCRATCH_CONVERTER_DOWNLOAD_STATE_PREFERENCE_KEY = "scratchconverter" + ".downloadStatePref"; @@ -59,4 +62,5 @@ private SharedPreferenceKeys() { public static final String SHOW_SURVEY_KEY = "showSurvey"; public static final String SURVEY_URL1_HASH_KEY = "surveyUrl1Hash"; public static final String SURVEY_URL2_HASH_KEY = "surveyUrl2Hash"; + public static final String NEW_SPRITE_VISUAL_PLACEMENT_KEY = "newSpriteVisualPlacement"; } diff --git a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java index 5e053f658eb..d661160e97b 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java @@ -132,6 +132,7 @@ import org.catrobat.catroid.content.actions.SetSizeToAction; import org.catrobat.catroid.content.actions.SetTempoAction; import org.catrobat.catroid.content.actions.SetTextAction; +import org.catrobat.catroid.content.actions.SetThreadColorAction; import org.catrobat.catroid.content.actions.SetTransparencyAction; import org.catrobat.catroid.content.actions.SetVariableAction; import org.catrobat.catroid.content.actions.SetVisibleAction; @@ -1105,6 +1106,15 @@ public Action createSewUpAction(Sprite sprite) { return action; } + public Action createSetThreadColorAction(Sprite sprite, SequenceAction sequence, Formula color) { + SetThreadColorAction action = Actions.action(SetThreadColorAction.class); + Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence); + action.setSprite(sprite); + action.setScope(scope); + action.setColor(color); + return action; + } + public static Action createScriptSequenceAction(Script script) { return new ScriptSequenceAction(script); } diff --git a/catroid/src/main/java/org/catrobat/catroid/content/Project.java b/catroid/src/main/java/org/catrobat/catroid/content/Project.java index f0f6d4e6b7b..9e204dce589 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/Project.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/Project.java @@ -225,8 +225,24 @@ public List getUserVariablesCopy() { return userVariablesCopy; } - public void setUserVariables(List newUserVariables) { - userVariables = newUserVariables; + public void restoreUserDataValues(List currentUserDataList, List userDataListToRestore) { + for (T userData : currentUserDataList) { + for (T userDataToRestore : userDataListToRestore) { + if (userData.getClass() == UserVariable.class) { + UserVariable userVariable = (UserVariable) userData; + UserVariable newUserVariable = (UserVariable) userDataToRestore; + if (userVariable.getName().equals(newUserVariable.getName())) { + userVariable.setValue(newUserVariable.getValue()); + } + } else { + UserList userList = (UserList) userData; + UserList newUserList = (UserList) userDataToRestore; + if (userList.getName().equals(newUserList.getName())) { + userList.setValue(newUserList.getValue()); + } + } + } + } } public UserVariable getUserVariable(String name) { @@ -258,10 +274,6 @@ public List getUserLists() { return userLists; } - public void setUserLists(List newUserLists) { - userLists = newUserLists; - } - public List getUserListsCopy() { if (userLists == null) { userLists = new ArrayList<>(); @@ -297,10 +309,6 @@ public boolean removeUserList(String name) { return false; } - public void setMultiplayerVariables(List newMultiplayerVariables) { - multiplayerVariables = newMultiplayerVariables; - } - public List getMultiplayerVariablesCopy() { if (multiplayerVariables == null) { multiplayerVariables = new ArrayList<>(); diff --git a/catroid/src/main/java/org/catrobat/catroid/content/Sprite.java b/catroid/src/main/java/org/catrobat/catroid/content/Sprite.java index b3a3324f53d..fa164368967 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/Sprite.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/Sprite.java @@ -25,6 +25,7 @@ import android.content.Context; import android.util.Log; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Stage; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; @@ -88,6 +89,7 @@ public class Sprite implements Cloneable, Nameable, Serializable { private transient Multimap idToEventThreadMap = LinkedHashMultimap.create(); private transient Set conditionScriptTriggers = new HashSet<>(); private transient List usedTouchPointer = new ArrayList<>(); + private transient Color embroideryThreadColor = Color.BLACK; @XStreamAsAttribute private String name; @@ -226,8 +228,24 @@ public boolean checkUserData(T newUserData, List oldUserData) { return false; } - public void setUserVariables(List newUserVariables) { - userVariables = newUserVariables; + public void restoreUserDataValues(List currentUserDataList, List userDataListToRestore) { + for (T userData : currentUserDataList) { + for (T userDataToRestore : userDataListToRestore) { + if (userData.getClass() == UserVariable.class) { + UserVariable userVariable = (UserVariable) userData; + UserVariable newUserVariable = (UserVariable) userDataToRestore; + if (userVariable.getName().equals(newUserVariable.getName())) { + userVariable.setValue(newUserVariable.getValue()); + } + } else { + UserList userList = (UserList) userData; + UserList newUserList = (UserList) userDataToRestore; + if (userList.getName().equals(newUserList.getName())) { + userList.setValue(newUserList.getValue()); + } + } + } + } } public List getUserVariablesCopy() { @@ -260,10 +278,6 @@ public boolean addUserVariable(UserVariable userVariable) { return userVariables.add(userVariable); } - public void setUserLists(List newUserLists) { - userLists = newUserLists; - } - public List getUserListsCopy() { if (userLists == null) { userLists = new ArrayList<>(); @@ -678,4 +692,12 @@ public List removeAllEmptyScriptBricks() { return idsToRemove; } + + public void setEmbroideryThreadColor(Color embroideryThreadColor) { + this.embroideryThreadColor = embroideryThreadColor; + } + + public Color getEmbroideryThreadColor() { + return this.embroideryThreadColor; + } } diff --git a/catroid/src/main/java/org/catrobat/catroid/content/actions/SetThreadColorAction.java b/catroid/src/main/java/org/catrobat/catroid/content/actions/SetThreadColorAction.java new file mode 100644 index 00000000000..f5517a7fc2b --- /dev/null +++ b/catroid/src/main/java/org/catrobat/catroid/content/actions/SetThreadColorAction.java @@ -0,0 +1,74 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2018 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.catrobat.catroid.content.actions; + +import android.util.Log; + +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.scenes.scene2d.actions.TemporalAction; + +import org.catrobat.catroid.content.Scope; +import org.catrobat.catroid.content.Sprite; +import org.catrobat.catroid.formulaeditor.Formula; + +public class SetThreadColorAction extends TemporalAction { + + private Scope scope; + private Formula color; + private Sprite sprite; + + @Override + protected void update(float delta) { + try { + String colorStringInterpretation = "0xff0000"; + if (color != null) { + colorStringInterpretation = color.interpretString(scope); + } + + String red = "0x" + colorStringInterpretation.substring(1, 3); + String green = "0x" + colorStringInterpretation.substring(3, 5); + String blue = "0x" + colorStringInterpretation.substring(5, 7); + int redInt = Integer.decode(red); + int greenInt = Integer.decode(green); + int blueInt = Integer.decode(blue); + + Color colorInterpretation = new Color(); + Color.argb8888ToColor(colorInterpretation, android.graphics.Color.argb(0xFF, redInt, greenInt, blueInt)); + sprite.setEmbroideryThreadColor(colorInterpretation); + } catch (Exception exception) { + Log.d(getClass().getSimpleName(), "Formula interpretation for this specific Brick failed.", exception); + } + } + + public void setScope(Scope scope) { + this.scope = scope; + } + + public void setSprite(Sprite sprite) { + this.sprite = sprite; + } + + public void setColor(Formula color) { + this.color = color; + } +} diff --git a/catroid/src/main/java/org/catrobat/catroid/content/actions/SewUpAction.java b/catroid/src/main/java/org/catrobat/catroid/content/actions/SewUpAction.java index cb0d020e616..b497f94e92d 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/actions/SewUpAction.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/actions/SewUpAction.java @@ -41,27 +41,27 @@ protected void begin() { float x = sprite.look.getXInUserInterfaceDimensionUnit(); float y = sprite.look.getYInUserInterfaceDimensionUnit(); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); x += STEPS * Math.sin(radians); y += STEPS * Math.cos(radians); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); x -= STEPS * Math.sin(radians); y -= STEPS * Math.cos(radians); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); x -= STEPS * Math.sin(radians); y -= STEPS * Math.cos(radians); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); x += STEPS * Math.sin(radians); y += STEPS * Math.cos(radians); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); sprite.runningStitch.setStartCoordinates(sprite.look.getXInUserInterfaceDimensionUnit(), sprite.look.getYInUserInterfaceDimensionUnit()); diff --git a/catroid/src/main/java/org/catrobat/catroid/content/actions/StitchAction.java b/catroid/src/main/java/org/catrobat/catroid/content/actions/StitchAction.java index 747592617d6..ecfc56de719 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/actions/StitchAction.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/actions/StitchAction.java @@ -38,7 +38,7 @@ protected void update(float delta) { float x = sprite.look.getXInUserInterfaceDimensionUnit(); float y = sprite.look.getYInUserInterfaceDimensionUnit(); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); sprite.runningStitch.setStartCoordinates(x, y); sprite.runningStitch.resume(); } diff --git a/catroid/src/main/java/org/catrobat/catroid/content/bricks/Brick.java b/catroid/src/main/java/org/catrobat/catroid/content/bricks/Brick.java index 6eb2e11f1ce..420a7dc3515 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/bricks/Brick.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/bricks/Brick.java @@ -81,7 +81,7 @@ enum BrickField implements FormulaField { RASPI_DIGITAL_PIN_VALUE, RASPI_DIGITAL_PIN_NUMBER, RASPI_PWM_PERCENTAGE, RASPI_PWM_FREQUENCY, - EMBROIDERY_LENGTH, ZIGZAG_EMBROIDERY_LENGTH, ZIGZAG_EMBROIDERY_WIDTH, + EMBROIDERY_LENGTH, ZIGZAG_EMBROIDERY_LENGTH, ZIGZAG_EMBROIDERY_WIDTH, THREAD_COLOR, STORE_CSV_INTO_USERLIST_COLUMN, STORE_CSV_INTO_USERLIST_CSV, diff --git a/catroid/src/main/java/org/catrobat/catroid/content/bricks/EmptyEventBrick.java b/catroid/src/main/java/org/catrobat/catroid/content/bricks/EmptyEventBrick.java index 87d04f7edd0..ecb1442cd2b 100644 --- a/catroid/src/main/java/org/catrobat/catroid/content/bricks/EmptyEventBrick.java +++ b/catroid/src/main/java/org/catrobat/catroid/content/bricks/EmptyEventBrick.java @@ -50,7 +50,6 @@ public EmptyEventBrick() { public EmptyEventBrick(@NonNull EmptyScript script) { script.setScriptBrick(this); this.script = script; - setCommentedOut(true); } @Override diff --git a/catroid/src/main/java/org/catrobat/catroid/content/bricks/SetThreadColorBrick.java b/catroid/src/main/java/org/catrobat/catroid/content/bricks/SetThreadColorBrick.java new file mode 100644 index 00000000000..6f41a93e2b6 --- /dev/null +++ b/catroid/src/main/java/org/catrobat/catroid/content/bricks/SetThreadColorBrick.java @@ -0,0 +1,123 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2018 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.catrobat.catroid.content.bricks; + +import android.view.View; + +import org.catrobat.catroid.R; +import org.catrobat.catroid.content.Sprite; +import org.catrobat.catroid.content.actions.ScriptSequenceAction; +import org.catrobat.catroid.content.strategy.ShowColorPickerFormulaEditorStrategy; +import org.catrobat.catroid.content.strategy.ShowFormulaEditorStrategy; +import org.catrobat.catroid.formulaeditor.Formula; +import org.catrobat.catroid.formulaeditor.InterpretationException; +import org.catrobat.catroid.ui.UiUtils; + +import androidx.appcompat.app.AppCompatActivity; + +public class SetThreadColorBrick extends FormulaBrick { + + private static final long serialVersionUID = 1L; + + private final transient ShowFormulaEditorStrategy showFormulaEditorStrategy; + + public SetThreadColorBrick() { + addAllowedBrickField(BrickField.THREAD_COLOR, R.id.brick_set_thread_color_action_edit_text); + + showFormulaEditorStrategy = new ShowColorPickerFormulaEditorStrategy(); + } + + public SetThreadColorBrick(Formula color) { + this(); + setFormulaWithBrickField(BrickField.THREAD_COLOR, color); + } + + @Override + public int getViewResource() { + return R.layout.brick_set_thread_color; + } + + @Override + public void showFormulaEditorToEditFormula(View view) { + ShowFormulaEditorStrategy.Callback callback = new SetThreadColorBrickCallback(view); + showFormulaEditorStrategy.showFormulaEditorToEditFormula(view, callback); + } + + private void superShowFormulaEditor(View view) { + super.showFormulaEditorToEditFormula(view); + } + + @Override + public BrickField getDefaultBrickField() { + return BrickField.THREAD_COLOR; + } + + @Override + public void addActionToSequence(Sprite sprite, ScriptSequenceAction sequence) { + sequence.addAction(sprite.getActionFactory().createSetThreadColorAction( + sprite, sequence, getFormulaWithBrickField(BrickField.THREAD_COLOR))); + } + + private final class SetThreadColorBrickCallback implements ShowFormulaEditorStrategy.Callback { + private final View view; + + private SetThreadColorBrickCallback(View view) { + this.view = view; + } + + @Override + public void showFormulaEditor(View view) { + superShowFormulaEditor(view); + } + + @Override + public void setValue(int value) { + setFormulaWithBrickField(BrickField.THREAD_COLOR, new Formula(convertToHexString(value))); + + AppCompatActivity activity = UiUtils.getActivityFromView(view); + notifyDataSetChanged(activity); + } + + @Override + public int getValue() { + return getColorValueFromBrickField(BrickField.THREAD_COLOR); + } + + private int getColorValueFromBrickField(BrickField brickField) { + Formula formula = getFormulaWithBrickField(brickField); + try { + String value = formula.interpretString(null); + return Integer.decode(value); + } catch (InterpretationException e) { + return 0; + } + } + + private String convertToHexString(int value) { + String hexValue = Integer.toHexString(value); + hexValue = hexValue.substring(2); + hexValue = "#" + hexValue; + return hexValue; + } + } +} diff --git a/catroid/src/main/java/org/catrobat/catroid/devices/raspberrypi/RaspberryPiService.java b/catroid/src/main/java/org/catrobat/catroid/devices/raspberrypi/RaspberryPiService.java index 0b0ffb70388..ec3de77119b 100644 --- a/catroid/src/main/java/org/catrobat/catroid/devices/raspberrypi/RaspberryPiService.java +++ b/catroid/src/main/java/org/catrobat/catroid/devices/raspberrypi/RaspberryPiService.java @@ -172,8 +172,40 @@ public ArrayList getGpioList(String revision) { } private void initGpioVersionMap() { + gpioVersionMap.put("900021", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("900032", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("900092", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("900093", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("9000c1", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("9020e0", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("920092", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("920093", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("900061", GpioVersionType.COMPUTE_MODULE); + gpioVersionMap.put("a01040", GpioVersionType.BIG_GPIO); gpioVersionMap.put("a01041", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a02082", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a020a0", GpioVersionType.COMPUTE_MODULE); + gpioVersionMap.put("a020d3", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a02042", GpioVersionType.BIG_GPIO); gpioVersionMap.put("a21041", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a22042", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a22082", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a220a0", GpioVersionType.COMPUTE_MODULE); + gpioVersionMap.put("a32082", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a52082", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a22083", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("a02100", GpioVersionType.COMPUTE_MODULE); + gpioVersionMap.put("a03111", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("b03111", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("b03112", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("b03114", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("c03111", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("c03112", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("c03114", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("d03114", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("c03130", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("0015", GpioVersionType.BIG_GPIO); + gpioVersionMap.put("0014", GpioVersionType.BIG_GPIO); gpioVersionMap.put("0013", GpioVersionType.BIG_GPIO); gpioVersionMap.put("0012", GpioVersionType.BIG_GPIO); gpioVersionMap.put("0011", GpioVersionType.COMPUTE_MODULE); diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTPatternManager.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTPatternManager.java index 3527c064608..ea73d077189 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTPatternManager.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTPatternManager.java @@ -67,7 +67,7 @@ public EmbroideryStream getEmbroideryStream() { if (iterator.hasNext() && !stitchPoints.isEmpty()) { StitchPoint lastValidPoint = stitchPoints.get(stitchPoints.size() - 1); stream.addColorChange(); - stream.addStitchPoint(lastValidPoint.getX(), lastValidPoint.getY()); + stream.addStitchPoint(lastValidPoint.getX(), lastValidPoint.getY(), lastValidPoint.getColor()); } } return stream; diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchCommand.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchCommand.java index 383239f92b3..4e9ecbebb55 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchCommand.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchCommand.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.content.Sprite; public class DSTStitchCommand implements StitchCommand { @@ -30,12 +32,14 @@ public class DSTStitchCommand implements StitchCommand { private final float yCoord; private int layer; private final Sprite sprite; + Color threadColor; - public DSTStitchCommand(float x, float y, int layer, Sprite sprite) { + public DSTStitchCommand(float x, float y, int layer, Sprite sprite, Color threadColor) { this.xCoord = x; this.yCoord = y; this.layer = layer; this.sprite = sprite; + this.threadColor = threadColor; } @Override @@ -48,6 +52,11 @@ public float getY() { return yCoord; } + @Override + public Color getColor() { + return threadColor; + } + @Override public int getLayer() { return layer; @@ -66,28 +75,31 @@ public void act(EmbroideryWorkSpace workSpace, EmbroideryStream stream, StitchCo if (workSpace.getLastSprite() != null && !sprite.equals(workSpace.getLastSprite())) { stream.addColorChange(); - stream.addStitchPoint(workSpace.getCurrentX(), workSpace.getCurrentY()); + stream.addStitchPoint(workSpace.getCurrentX(), workSpace.getCurrentY(), workSpace.getColor()); if (DSTFileConstants.getMaxDistanceBetweenPoints(workSpace.getCurrentX(), workSpace.getCurrentY(), xCoord, yCoord) > DSTFileConstants.MAX_DISTANCE) { stream.addJump(); } - stream.addStitchPoint(workSpace.getCurrentX(), workSpace.getCurrentY()); + stream.addStitchPoint(workSpace.getCurrentX(), workSpace.getCurrentY(), workSpace.getColor()); } else if (!stream.getPointList().isEmpty() && previousCommandOfSprite != null && previousCommandOfSprite.getLayer() != layer) { stream.addColorChange(); if (DSTFileConstants.getMaxDistanceBetweenPoints(previousCommandOfSprite.getX(), previousCommandOfSprite.getY(), xCoord, yCoord) > DSTFileConstants.MAX_DISTANCE) { - stream.addStitchPoint(xCoord, yCoord); + stream.addStitchPoint(xCoord, yCoord, threadColor); } else { - stream.addStitchPoint(previousCommandOfSprite.getX(), previousCommandOfSprite.getY()); + stream.addStitchPoint(previousCommandOfSprite.getX(), + previousCommandOfSprite.getY(), previousCommandOfSprite.getColor()); stream.addJump(); - stream.addStitchPoint(previousCommandOfSprite.getX(), previousCommandOfSprite.getY()); + stream.addStitchPoint(previousCommandOfSprite.getX(), + previousCommandOfSprite.getY(), previousCommandOfSprite.getColor()); } } if (previousCommandOfSprite != null && previousCommandOfSprite.getLayer() != layer && DSTFileConstants.getMaxDistanceBetweenPoints(previousCommandOfSprite.getX(), previousCommandOfSprite.getY(), xCoord, yCoord) < DSTFileConstants.MAX_DISTANCE) { - stream.addStitchPoint(previousCommandOfSprite.getX(), previousCommandOfSprite.getY()); + stream.addStitchPoint(previousCommandOfSprite.getX(), previousCommandOfSprite.getY(), + previousCommandOfSprite.getColor()); } - stream.addStitchPoint(xCoord, yCoord); + stream.addStitchPoint(xCoord, yCoord, threadColor); workSpace.set(xCoord, yCoord, sprite); } diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchPoint.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchPoint.java index f1b859e3e44..8eb4123f284 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchPoint.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStitchPoint.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import java.io.FileOutputStream; import java.io.IOException; @@ -36,10 +38,12 @@ public class DSTStitchPoint implements StitchPoint { private int relativeY; private boolean jumpPoint = false; private boolean colorChangePoint = false; + private Color color; - public DSTStitchPoint(float x, float y) { + public DSTStitchPoint(float x, float y, Color color) { this.xCoord = x; this.yCoord = y; + this.color = color; } @Override @@ -52,6 +56,11 @@ public float getY() { return yCoord; } + @Override + public Color getColor() { + return color; + } + @Override public void appendToStream(FileOutputStream fileStream) throws IOException { byte[] dstPointBytes = setDSTPointBytes(); @@ -73,6 +82,11 @@ public void setColorChange(boolean colorChangePoint) { this.colorChangePoint = colorChangePoint; } + @Override + public void setColor(Color color) { + this.color = color; + } + @Override public boolean isColorChangePoint() { return colorChangePoint; diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStream.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStream.java index d96919d8709..0224cab4cf5 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStream.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTStream.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import java.util.ArrayList; public class DSTStream implements EmbroideryStream { @@ -49,8 +51,8 @@ public void addJump() { } @Override - public void addStitchPoint(float x, float y) { - DSTStitchPoint point = new DSTStitchPoint(x, y); + public void addStitchPoint(float x, float y, Color color) { + DSTStitchPoint point = new DSTStitchPoint(x, y, color); point.setColorChange(colorChangeBitSet); point.setJump(jumpBitSet); colorChangeBitSet = false; @@ -59,7 +61,7 @@ public void addStitchPoint(float x, float y) { header.initialize(x, y); point.setRelativeCoordinatesToPreviousPoint(x, y); } else { - addInterpolatedPoints(x, y); + addInterpolatedPoints(x, y, color); header.update(x, y); StitchPoint previousPoint = points.get(points.size() - 1); point.setRelativeCoordinatesToPreviousPoint(previousPoint.getX(), previousPoint.getY()); @@ -67,7 +69,7 @@ public void addStitchPoint(float x, float y) { points.add(point); } - private void addInterpolatedPoints(float currentX, float currentY) { + private void addInterpolatedPoints(float currentX, float currentY, Color color) { StitchPoint previousPoint = points.get(points.size() - 1); float distance = DSTFileConstants.getMaxDistanceBetweenPoints(currentX, currentY, @@ -75,18 +77,18 @@ private void addInterpolatedPoints(float currentX, float currentY) { if (distance > DSTFileConstants.MAX_DISTANCE) { int splitCount = (int) Math.ceil(distance / DSTFileConstants.MAX_DISTANCE); addJump(); - addStitchPoint(previousPoint.getX(), previousPoint.getY()); + addStitchPoint(previousPoint.getX(), previousPoint.getY(), previousPoint.getColor()); for (int count = 1; count < splitCount; count++) { float splitFactor = (float) count / splitCount; float x = interpolate(currentX, previousPoint.getX(), splitFactor); float y = interpolate(currentY, previousPoint.getY(), splitFactor); addJump(); - addStitchPoint(x, y); + addStitchPoint(x, y, previousPoint.getColor()); } addJump(); - addStitchPoint(currentX, currentY); + addStitchPoint(currentX, currentY, color); } } @@ -99,7 +101,7 @@ public void addAllStitchPoints(ArrayList stitchPoints) { if (!points.isEmpty() && !stitchPoints.isEmpty()) { addJump(); addStitchPoint(points.get(points.size() - 1).getX(), - points.get(points.size() - 1).getY()); + points.get(points.size() - 1).getY(), points.get(points.size() - 1).getColor()); } for (StitchPoint stitchPoint : stitchPoints) { if (stitchPoint.isColorChangePoint()) { @@ -107,7 +109,7 @@ public void addAllStitchPoints(ArrayList stitchPoints) { } else if (stitchPoint.isJumpPoint()) { addJump(); } - addStitchPoint(stitchPoint.getX(), stitchPoint.getY()); + addStitchPoint(stitchPoint.getX(), stitchPoint.getY(), stitchPoint.getColor()); } } diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTWorkSpace.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTWorkSpace.java index c619c9c1b00..19a697597e1 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTWorkSpace.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/DSTWorkSpace.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.content.Sprite; public class DSTWorkSpace implements EmbroideryWorkSpace { @@ -30,6 +32,7 @@ public class DSTWorkSpace implements EmbroideryWorkSpace { private float currentX; private float currentY; private Sprite lastSprite; + private Color threadColor; @Override public void set(float currentX, float currentY, Sprite currentSprite) { @@ -48,6 +51,11 @@ public float getCurrentY() { return currentY; } + @Override + public Color getColor() { + return threadColor; + } + @Override public Sprite getLastSprite() { return lastSprite; diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryStream.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryStream.java index 9deabafd334..645277d4334 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryStream.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryStream.java @@ -23,12 +23,14 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import java.util.ArrayList; public interface EmbroideryStream { void addColorChange(); void addJump(); - void addStitchPoint(float x, float y); + void addStitchPoint(float x, float y, Color color); void addAllStitchPoints(ArrayList stitchPoints); ArrayList getPointList(); EmbroideryHeader getHeader(); diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryWorkSpace.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryWorkSpace.java index 95045d85252..a5a28663c79 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryWorkSpace.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/EmbroideryWorkSpace.java @@ -23,6 +23,8 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.content.Sprite; public interface EmbroideryWorkSpace { @@ -30,4 +32,5 @@ public interface EmbroideryWorkSpace { float getCurrentX(); float getCurrentY(); Sprite getLastSprite(); + Color getColor(); } diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/SimpleRunningStitch.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/SimpleRunningStitch.java index ab8cb2c740d..811e4603d4f 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/SimpleRunningStitch.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/SimpleRunningStitch.java @@ -66,7 +66,7 @@ private void interpolateStitches(int interpolationCount, float currentX, float c if (first) { first = false; StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(firstX, firstY, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); } for (int count = 1; count <= interpolationCount; count++) { @@ -74,7 +74,7 @@ private void interpolateStitches(int interpolationCount, float currentX, float c float x = interpolate(currentX, firstX, splitFactor); float y = interpolate(currentY, firstY, splitFactor); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); } } } diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchCommand.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchCommand.java index be6a3e082a1..a8fdfcf49b3 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchCommand.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchCommand.java @@ -23,11 +23,14 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.content.Sprite; public interface StitchCommand { float getX(); float getY(); + Color getColor(); int getLayer(); Sprite getSprite(); diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchPoint.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchPoint.java index 2891c4f4109..f2aa0085fb3 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchPoint.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/StitchPoint.java @@ -23,16 +23,20 @@ package org.catrobat.catroid.embroidery; +import com.badlogic.gdx.graphics.Color; + import java.io.FileOutputStream; import java.io.IOException; public interface StitchPoint { float getX(); float getY(); + Color getColor(); void appendToStream(FileOutputStream fileStream) throws IOException; void setJump(boolean jumpPoint); boolean isJumpPoint(); void setColorChange(boolean colorChangePoint); + void setColor(Color color); boolean isColorChangePoint(); void setRelativeCoordinatesToPreviousPoint(float previousX, float previousY); boolean isConnectingPoint(); diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/TripleRunningStitch.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/TripleRunningStitch.java index d09602877a4..fff4a579893 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/TripleRunningStitch.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/TripleRunningStitch.java @@ -66,7 +66,7 @@ private void interpolateStitches(int interpolationCount, float currentX, float c if (first) { first = false; StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(firstX, firstY, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); } float previousX = firstX; float previousY = firstY; @@ -76,11 +76,11 @@ private void interpolateStitches(int interpolationCount, float currentX, float c float x = interpolate(currentX, firstX, splitFactor); float y = interpolate(currentY, firstY, splitFactor); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(previousX, previousY, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(x, y, - sprite.look.getZIndex(), sprite)); + sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); previousX = x; previousY = y; } diff --git a/catroid/src/main/java/org/catrobat/catroid/embroidery/ZigZagRunningStitch.java b/catroid/src/main/java/org/catrobat/catroid/embroidery/ZigZagRunningStitch.java index 098784a9c35..24c6d6e63e7 100644 --- a/catroid/src/main/java/org/catrobat/catroid/embroidery/ZigZagRunningStitch.java +++ b/catroid/src/main/java/org/catrobat/catroid/embroidery/ZigZagRunningStitch.java @@ -93,7 +93,7 @@ private void addPointInDirection(float x, float y, float degrees) { float yCoord = (float) (y - (width / 2) * Math.cos(Math.toRadians(degrees + 90)) * direction); direction *= (-1); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(xCoord, - yCoord, sprite.look.getZIndex(), sprite)); + yCoord, sprite.look.getZIndex(), sprite, sprite.getEmbroideryThreadColor())); if (listener != null) { listener.onAdd(xCoord, yCoord); } diff --git a/catroid/src/main/java/org/catrobat/catroid/io/BackwardCompatibleCatrobatLanguageXStream.java b/catroid/src/main/java/org/catrobat/catroid/io/BackwardCompatibleCatrobatLanguageXStream.java index 80774a6f91e..ed723589770 100644 --- a/catroid/src/main/java/org/catrobat/catroid/io/BackwardCompatibleCatrobatLanguageXStream.java +++ b/catroid/src/main/java/org/catrobat/catroid/io/BackwardCompatibleCatrobatLanguageXStream.java @@ -144,6 +144,7 @@ import org.catrobat.catroid.content.bricks.SetSizeToBrick; import org.catrobat.catroid.content.bricks.SetTempoBrick; import org.catrobat.catroid.content.bricks.SetTextBrick; +import org.catrobat.catroid.content.bricks.SetThreadColorBrick; import org.catrobat.catroid.content.bricks.SetTransparencyBrick; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.content.bricks.SetVelocityBrick; @@ -735,6 +736,9 @@ private void initializeBrickInfoMap() { brickInfo = new BrickInfo(SewUpBrick.class.getSimpleName()); brickInfoMap.put("sewUpBrick", brickInfo); + + brickInfo = new BrickInfo(SetThreadColorBrick.class.getSimpleName()); + brickInfoMap.put("setThreadColorBrick", brickInfo); } private void initializeScriptInfoMap() { diff --git a/catroid/src/main/java/org/catrobat/catroid/io/XstreamSerializer.java b/catroid/src/main/java/org/catrobat/catroid/io/XstreamSerializer.java index 3163d9b4a27..a10a5edd82f 100644 --- a/catroid/src/main/java/org/catrobat/catroid/io/XstreamSerializer.java +++ b/catroid/src/main/java/org/catrobat/catroid/io/XstreamSerializer.java @@ -32,6 +32,7 @@ import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; import org.catrobat.catroid.BuildConfig; +import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.common.LookData; import org.catrobat.catroid.common.NfcTagData; import org.catrobat.catroid.common.ProjectData; @@ -212,6 +213,7 @@ import org.catrobat.catroid.content.bricks.SetSizeToBrick; import org.catrobat.catroid.content.bricks.SetTempoBrick; import org.catrobat.catroid.content.bricks.SetTextBrick; +import org.catrobat.catroid.content.bricks.SetThreadColorBrick; import org.catrobat.catroid.content.bricks.SetTransparencyBrick; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.content.bricks.SetVelocityBrick; @@ -278,8 +280,11 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import androidx.annotation.VisibleForTesting; @@ -595,6 +600,7 @@ private void prepareXstream(Class projectClass, Class sceneClass) { xstream.alias("brick", StopRunningStitchBrick.class); xstream.alias("brick", ZigZagStitchBrick.class); xstream.alias("brick", TripleStitchBrick.class); + xstream.alias("brick", SetThreadColorBrick.class); xstream.alias("brick", SewUpBrick.class); xstream.alias("brick", WriteEmbroideryToFileBrick.class); xstream.alias("brick", WaitTillIdleBrick.class); @@ -738,6 +744,20 @@ private static void setFileReferences(Project project) { } } } + private boolean unnecessaryChanges(String currentXml, String previousXml) { + String formulaYRegex = ""; + String formulaXRegex = ""; + Pattern formulaYPattern = Pattern.compile(formulaYRegex, Pattern.CASE_INSENSITIVE); + Pattern formulaXPattern = Pattern.compile(formulaXRegex, Pattern.CASE_INSENSITIVE); + Matcher currentFormulaYMatcher = formulaYPattern.matcher(currentXml); + Matcher previousFormulaXMatcher = formulaXPattern.matcher(previousXml); + currentFormulaYMatcher.find(); + previousFormulaXMatcher.find(); + if (previousFormulaXMatcher.matches() && currentFormulaYMatcher.matches() && (currentXml.indexOf(previousFormulaXMatcher.group(0)) == previousXml.indexOf(currentFormulaYMatcher.group(0)))) { + return true; + } + return false; + } public boolean saveProject(Project project) { if (project == null) { @@ -769,6 +789,17 @@ public boolean saveProject(Project project) { if (previousXml.equals(currentXml)) { Log.d(TAG, "Project version is the same. Do not update " + currentCodeFile.getName()); return false; + } else { + String languageRegex = ".*"; + Pattern languagePattern = Pattern.compile(languageRegex, Pattern.CASE_INSENSITIVE); + Matcher currentLanguageMatcher = languagePattern.matcher(currentXml); + Matcher previousLanguageMatcher = languagePattern.matcher(previousXml); + currentLanguageMatcher.find(); + previousLanguageMatcher.find(); + if (Objects.equals(currentLanguageMatcher.group(0), + previousLanguageMatcher.group(0)) && (!unnecessaryChanges(currentXml, previousXml))) { + ProjectManager.getInstance().changedProject(project.getName()); + } } } catch (Exception e) { Log.e(TAG, "Opening project at " + currentCodeFile.getAbsolutePath() + " failed.", e); diff --git a/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectCopyTask.java b/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectCopyTask.java index f3a2382e687..5b51f85d866 100644 --- a/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectCopyTask.java +++ b/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectCopyTask.java @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2018 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -26,6 +26,7 @@ import android.os.AsyncTask; import android.util.Log; +import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.utils.FileMetaDataExtractor; @@ -61,6 +62,7 @@ public static boolean task(File srcDir, String dstName) { try { StorageOperations.copyDir(srcDir, dstDir); XstreamSerializer.renameProject(new File(dstDir, CODE_XML_FILE_NAME), dstName); + ProjectManager.getInstance().addNewDownloadedProject(dstName); return true; } catch (IOException e) { Log.e(TAG, "Something went wrong while copying " + srcDir.getAbsolutePath() + " to " + dstName, e); diff --git a/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectRenameTask.java b/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectRenameTask.java index ec8ad008f4c..9ae758439d8 100644 --- a/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectRenameTask.java +++ b/catroid/src/main/java/org/catrobat/catroid/io/asynctask/ProjectRenameTask.java @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2018 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -26,6 +26,7 @@ import android.os.AsyncTask; import android.util.Log; +import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.io.XstreamSerializer; import org.catrobat.catroid.utils.FileMetaDataExtractor; @@ -59,6 +60,7 @@ public static File task(File projectDir, String dstName) throws IOException { if (projectDir.renameTo(dstDir) && XstreamSerializer.renameProject(new File(dstDir, CODE_XML_FILE_NAME), dstName)) { + ProjectManager.getInstance().moveChangedFlag(projectDir.getName(), dstName); return dstDir; } else { throw new IOException("Cannot rename project directory " + projectDir.getAbsolutePath() + " to " + dstName); diff --git a/catroid/src/main/java/org/catrobat/catroid/stage/EmbroideryActor.java b/catroid/src/main/java/org/catrobat/catroid/stage/EmbroideryActor.java index f9a48f72976..e92b8190800 100644 --- a/catroid/src/main/java/org/catrobat/catroid/stage/EmbroideryActor.java +++ b/catroid/src/main/java/org/catrobat/catroid/stage/EmbroideryActor.java @@ -23,7 +23,6 @@ package org.catrobat.catroid.stage; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.scenes.scene2d.Actor; @@ -58,11 +57,12 @@ public void draw(Batch batch, float parentAlpha) { if (stitchPoints.size() >= 2) { batch.end(); - shapeRenderer.setColor(Color.BLACK); - shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); - StitchPoint previousStitchPoint; StitchPoint stitchPoint = iterator.next(); + + shapeRenderer.setColor(stitchPoint.getColor()); + shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); + drawCircle(stitchPoint); boolean colorChange = false; @@ -73,9 +73,11 @@ public void draw(Batch batch, float parentAlpha) { colorChange |= stitchPoint.isColorChangePoint(); if (!colorChange) { + shapeRenderer.setColor(previousStitchPoint.getColor()); drawLine(previousStitchPoint, stitchPoint); } if (stitchPoint.isConnectingPoint()) { + shapeRenderer.setColor(stitchPoint.getColor()); drawCircle(stitchPoint); colorChange = false; } diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt index a9e5ceb5bd0..4a036e6f3c3 100644 --- a/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt +++ b/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2019 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -30,6 +30,7 @@ import android.content.Intent import android.os.Bundle import android.os.ResultReceiver import android.util.Log +import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.common.Constants import org.catrobat.catroid.common.Constants.CACHE_DIR @@ -139,6 +140,7 @@ class ProjectDownloadService : IntentService("ProjectDownloadService") { ZipArchiver().unzip(destinationFile, projectDir) XstreamSerializer.renameProject(File(projectDir, Constants.CODE_XML_FILE_NAME), projectName) + ProjectManager.getInstance().addNewDownloadedProject(projectName) val downloadIntent = Intent(context, MainMenuActivity::class.java) downloadIntent.setAction(Intent.ACTION_MAIN) diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/MarketingActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/MarketingActivity.java index c2af3a4544c..b4a91b2815f 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/MarketingActivity.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/MarketingActivity.java @@ -34,11 +34,13 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; +import org.catrobat.catroid.common.Constants; import org.catrobat.catroid.common.ScreenValues; import org.catrobat.catroid.content.XmlHeader; import org.catrobat.catroid.utils.ToastUtil; @@ -69,9 +71,13 @@ protected void onCreate(Bundle savedInstanceState) { Bitmap bitmap = scaleDrawable2Bitmap(xmlheader.islandscapeMode()); - ImageButton imageView = (ImageButton) findViewById(R.id.pocket_code_image); + ImageView imageView = (ImageView) findViewById(R.id.pocket_code_image); imageView.setImageBitmap(bitmap); - imageView.setOnClickListener(new View.OnClickListener() { + + LinearLayout googlePlayStore = (LinearLayout) findViewById(R.id.googlePlayStore); + LinearLayout huaweiAppGallery = (LinearLayout) findViewById(R.id.huaweiAppGallery); + + googlePlayStore.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Uri uri = Uri.parse("market://details?id=org.catrobat.catroid"); @@ -84,6 +90,19 @@ public void onClick(View v) { } }); + huaweiAppGallery.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Uri uri = Uri.parse(Constants.HUAWEI_APP_GALLERY_LINK); + Intent myAppLinkToMarket = new Intent(Intent.ACTION_VIEW, uri); + try { + startActivity(myAppLinkToMarket); + } catch (ActivityNotFoundException e) { + ToastUtil.showError(MarketingActivity.this, R.string.error_cannot_open_huawei_app_gallery); + } + } + }); + TextView website = (TextView) findViewById(R.id.website_link); TextView playstore = (TextView) findViewById(R.id.playStore_link); diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/ProjectActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/ProjectActivity.java index ed51704343b..cb23e14012e 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/ProjectActivity.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/ProjectActivity.java @@ -29,7 +29,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -37,11 +36,12 @@ import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.cast.CastManager; -import org.catrobat.catroid.common.LookData; import org.catrobat.catroid.content.Project; import org.catrobat.catroid.content.Scene; import org.catrobat.catroid.content.Sprite; +import org.catrobat.catroid.content.StartScript; import org.catrobat.catroid.content.bricks.Brick; +import org.catrobat.catroid.content.bricks.PlaceAtBrick; import org.catrobat.catroid.io.StorageOperations; import org.catrobat.catroid.io.asynctask.ProjectSaveTask; import org.catrobat.catroid.stage.StageActivity; @@ -49,6 +49,7 @@ import org.catrobat.catroid.ui.dialogs.LegoSensorConfigInfoDialog; import org.catrobat.catroid.ui.fragment.ProjectOptionsFragment; import org.catrobat.catroid.ui.recyclerview.controller.SceneController; +import org.catrobat.catroid.ui.recyclerview.dialog.NewSpriteDialogFragment; import org.catrobat.catroid.ui.recyclerview.dialog.TextInputDialog; import org.catrobat.catroid.ui.recyclerview.dialog.textwatcher.DuplicateInputTextWatcher; import org.catrobat.catroid.ui.recyclerview.fragment.RecyclerViewFragment; @@ -59,7 +60,6 @@ import org.catrobat.catroid.utils.Utils; import java.io.File; -import java.io.IOException; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; @@ -68,17 +68,18 @@ import static org.catrobat.catroid.common.Constants.DEFAULT_IMAGE_EXTENSION; import static org.catrobat.catroid.common.Constants.EV3; -import static org.catrobat.catroid.common.Constants.IMAGE_DIRECTORY_NAME; import static org.catrobat.catroid.common.Constants.JPEG_IMAGE_EXTENSION; -import static org.catrobat.catroid.common.Constants.MEDIA_LIBRARY_CACHE_DIR; import static org.catrobat.catroid.common.Constants.NXT; import static org.catrobat.catroid.common.Constants.TMP_IMAGE_FILE_NAME; import static org.catrobat.catroid.common.FlavoredConstants.LIBRARY_LOOKS_URL; import static org.catrobat.catroid.stage.TestResult.TEST_RESULT_MESSAGE; +import static org.catrobat.catroid.ui.SpriteActivity.REQUEST_CODE_VISUAL_PLACEMENT; import static org.catrobat.catroid.ui.WebViewActivity.MEDIA_FILE_PATH; import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_MINDSTORMS_EV3_SHOW_SENSOR_INFO_BOX_DISABLED; import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_MINDSTORMS_NXT_SHOW_SENSOR_INFO_BOX_DISABLED; import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.isCastSharedPreferenceEnabled; +import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.X_COORDINATE_BUNDLE_ARGUMENT; +import static org.catrobat.catroid.visualplacement.VisualPlacementActivity.Y_COORDINATE_BUNDLE_ARGUMENT; public class ProjectActivity extends BaseCastActivity implements ProjectSaveTask.ProjectSaveListener { @@ -269,17 +270,23 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { uri = new ImportFromCameraLauncher(this).getCacheCameraUri(); addSpriteFromUri(uri, JPEG_IMAGE_EXTENSION); break; + case REQUEST_CODE_VISUAL_PLACEMENT: + Bundle extras = data.getExtras(); + if (extras == null) { + return; + } + int xCoordinate = extras.getInt(X_COORDINATE_BUNDLE_ARGUMENT); + int yCoordinate = extras.getInt(Y_COORDINATE_BUNDLE_ARGUMENT); + + PlaceAtBrick placeAtBrick = new PlaceAtBrick(xCoordinate, yCoordinate); + Sprite currentSprite = ProjectManager.getInstance().getCurrentSprite(); + StartScript startScript = new StartScript(); + currentSprite.addScript(startScript); + startScript.addBrick(placeAtBrick); + break; } } - public void imgFormatNotSupportedDialog() { - - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this).setMessage(getString(R.string.Image_format_not_supported)).setPositiveButton(getString(R.string.ok), (dialog1, which) -> dialog1.cancel()); - - AlertDialog alertDialog = alertDialogBuilder.create(); - alertDialog.show(); - } - public void addSpriteFromUri(final Uri uri) { addSpriteFromUri(uri, DEFAULT_IMAGE_EXTENSION); } @@ -306,45 +313,8 @@ public void addSpriteFromUri(final Uri uri, final String imageExtension) { lookDataName = new UniqueNameProvider().getUniqueNameInNameables(resolvedName, currentScene.getSpriteList()); - TextInputDialog.Builder builder = new TextInputDialog.Builder(this); - builder.setHint(getString(R.string.sprite_name_label)) - .setText(lookDataName) - .setTextWatcher(new DuplicateInputTextWatcher<>(currentScene.getSpriteList())) - .setPositiveButton(getString(R.string.ok), (TextInputDialog.OnClickListener) (dialog, textInput) -> { - Sprite sprite = new Sprite(textInput); - currentScene.addSprite(sprite); - try { - File imageDirectory = new File(currentScene.getDirectory(), IMAGE_DIRECTORY_NAME); - File file = StorageOperations.copyUriToDir(getContentResolver(), uri, - imageDirectory, lookFileName); - Utils.removeExifData(imageDirectory, lookFileName); - LookData lookData = new LookData(textInput, file); - if (lookData.getImageMimeType() == null) { - imgFormatNotSupportedDialog(); - currentScene.removeSprite(sprite); - } else { - sprite.getLookList().add(lookData); - lookData.getCollisionInformation().calculate(); - } - } catch (IOException e) { - Log.e(TAG, Log.getStackTraceString(e)); - } - if (getCurrentFragment() instanceof SpriteListFragment) { - ((SpriteListFragment) getCurrentFragment()).notifyDataSetChanged(); - } - }); - - builder.setTitle(R.string.new_sprite_dialog_title) - .setNegativeButton(R.string.cancel, (dialog, which) -> { - try { - if (MEDIA_LIBRARY_CACHE_DIR.exists()) { - StorageOperations.deleteDir(MEDIA_LIBRARY_CACHE_DIR); - } - } catch (IOException e) { - Log.e(TAG, Log.getStackTraceString(e)); - } - }) - .show(); + new NewSpriteDialogFragment(lookDataName, lookFileName, getContentResolver(), uri, getCurrentFragment()) + .show(getSupportFragmentManager(), NewSpriteDialogFragment.Companion.getTAG()); } public void handleAddButton(View view) { diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.java index 7e370406ad7..08ff5d91352 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.java @@ -108,6 +108,8 @@ public class ProjectUploadActivity extends BaseActivity implements private static final String OPEN_URL_BRICK = "OpenUrlBrick"; private static final String WIKI_URL = "" + "https://catrob.at/webbricks"; + private static final String LICENSE_TO_PLAY_URL = "" + + "https://catrob.at/ltp"; private static final String PROGRAM_NAME_START_TAG = ""; private static final String PROGRAM_NAME_END_TAG = ""; @@ -185,7 +187,9 @@ private void onCreateView() { TextView projectSizeView = findViewById(R.id.project_size_view); projectSizeView .setText(FileMetaDataExtractor.getSizeAsString(project.getDirectory(), this)); - + if (!ProjectManager.getInstance().isChangedProject(project)) { + showUploadIsUnchangedDialog(); + } nameInputLayout = findViewById(R.id.input_project_name); descriptionInputLayout = findViewById(R.id.input_project_description); notesAndCreditsInputLayout = findViewById(R.id.input_project_notes_and_credits); @@ -201,6 +205,24 @@ private void onCreateView() { setNextButtonEnabled(true); } + private void showUploadIsUnchangedDialog() { + View view = View.inflate(this, R.layout.dialog_upload_unchanged_project, null); + TextView warningText = view.findViewById(R.id.unchanged_upload_url); + warningText.setMovementMethod(LinkMovementMethod.getInstance()); + String warningURL = getString(R.string.unchanged_upload_url, + LICENSE_TO_PLAY_URL); + warningText.setText(Html.fromHtml(warningURL)); + AlertDialog alertDialog = new AlertDialog.Builder(this) + .setTitle(R.string.warning) + .setView(view) + .setPositiveButton(getString(R.string.ok), (dialog, which) -> { + finish(); + }) + .setCancelable(false) + .create(); + alertDialog.show(); + } + @Override protected void onDestroy() { if (uploadProgressDialog != null && uploadProgressDialog.isShowing()) { @@ -458,9 +480,11 @@ public void showUploadDialog() { .setView(R.layout.dialog_upload_project_progress) .setPositiveButton(R.string.progress_upload_dialog_show_program, (dialog, which) -> { loadBackup(); + ProjectManager.getInstance().resetChangedFlag(project); }) .setNegativeButton(R.string.done, (dialog, which) -> { loadBackup(); + ProjectManager.getInstance().resetChangedFlag(project); if (surveyCampaign != null) { surveyCampaign.showSurvey(this); @@ -510,6 +534,7 @@ public void onReceiveResult(int resultCode, @Nullable Bundle resultData) { intent.putExtra(WebViewActivity.INTENT_PARAMETER_URL, projectUrl); startActivity(intent); loadBackup(); + ProjectManager.getInstance().resetChangedFlag(project); finish(); }); positiveButton.setEnabled(true); diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/SpriteActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/SpriteActivity.java index af7263c14b1..3bd94cc4d92 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/SpriteActivity.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/SpriteActivity.java @@ -212,6 +212,19 @@ public boolean onCreateOptionsMenu(Menu menu) { public void showUndo(boolean visible) { if (currentMenu != null) { currentMenu.findItem(R.id.menu_undo).setVisible(visible); + if (visible) { + ProjectManager.getInstance().changedProject(currentProject.getName()); + } + } + } + + public void checkForChange() { + if (currentMenu != null) { + if (currentMenu.findItem(R.id.menu_undo).isVisible()) { + ProjectManager.getInstance().changedProject(currentProject.getName()); + } else { + ProjectManager.getInstance().resetChangedFlag(currentProject); + } } } diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/dialogs/StageDialog.java b/catroid/src/main/java/org/catrobat/catroid/ui/dialogs/StageDialog.java index b1718aef766..069b2fef48c 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/dialogs/StageDialog.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/dialogs/StageDialog.java @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2018 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -32,6 +32,8 @@ import android.widget.Button; import android.widget.ImageButton; +import com.badlogic.gdx.graphics.Color; + import org.catrobat.catroid.ProjectManager; import org.catrobat.catroid.R; import org.catrobat.catroid.cast.CastManager; @@ -135,6 +137,7 @@ public void onClick(View view) { @Override public void onBackPressed() { clearBroadcastMaps(); + resetEmbroideryThreadColor(); dismiss(); stageActivity.exit(); new FinishThreadAndDisposeTexturesTask().execute(null, null, null); @@ -182,6 +185,8 @@ public void onRestartPressed() { } clearBroadcastMaps(); + resetEmbroideryThreadColor(); + dismiss(); SensorHandler.timerReferenceValue = SystemClock.uptimeMillis(); restartProject(); @@ -198,6 +203,7 @@ private void makeScreenshot() { success -> { if (success) { ToastUtil.showSuccess(stageActivity, R.string.notification_screenshot_ok); + ProjectManager.getInstance().changedProject(ProjectManager.getInstance().getCurrentProject().getName()); } else { ToastUtil.showError(stageActivity, R.string.error_screenshot_failed); } @@ -235,6 +241,14 @@ private void clearBroadcastMaps() { } } + private void resetEmbroideryThreadColor() { + for (Scene scene : ProjectManager.getInstance().getCurrentProject().getSceneList()) { + for (Sprite sprite : scene.getSpriteList()) { + sprite.setEmbroideryThreadColor(Color.BLACK); + } + } + } + private class FinishThreadAndDisposeTexturesTask extends AsyncTask { @Override protected Void doInBackground(Void... params) { diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java index 0cdb6e81efa..9b395bbf8af 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.java @@ -180,6 +180,7 @@ import org.catrobat.catroid.content.bricks.SetRotationStyleBrick; import org.catrobat.catroid.content.bricks.SetSizeToBrick; import org.catrobat.catroid.content.bricks.SetTempoBrick; +import org.catrobat.catroid.content.bricks.SetThreadColorBrick; import org.catrobat.catroid.content.bricks.SetTransparencyBrick; import org.catrobat.catroid.content.bricks.SetVariableBrick; import org.catrobat.catroid.content.bricks.SetVelocityBrick; @@ -845,6 +846,7 @@ private List setupRaspiCategoryList() { private List setupEmbroideryCategoryList(Context context) { List embroideryBrickList = new ArrayList<>(); embroideryBrickList.add(new StitchBrick()); + embroideryBrickList.add(new SetThreadColorBrick(new Formula(BrickValues.THREAD_COLOR))); embroideryBrickList.add(new RunningStitchBrick(new Formula(BrickValues.STITCH_LENGTH))); embroideryBrickList.add(new ZigZagStitchBrick(new Formula(BrickValues.ZIGZAG_STITCH_LENGTH), new Formula(BrickValues.ZIGZAG_STITCH_WIDTH))); diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/adapter/BrickAdapter.java b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/adapter/BrickAdapter.java index cf2e2f77cba..ca8ea05ea20 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/adapter/BrickAdapter.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/adapter/BrickAdapter.java @@ -34,6 +34,7 @@ import org.catrobat.catroid.content.Script; import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.content.bricks.Brick; +import org.catrobat.catroid.content.bricks.EmptyEventBrick; import org.catrobat.catroid.content.bricks.FormulaBrick; import org.catrobat.catroid.content.bricks.ListSelectorBrick; import org.catrobat.catroid.content.bricks.ScriptBrick; @@ -125,7 +126,7 @@ public View getView(final int position, View convertView, final ViewGroup parent Drawable background = brickViewContainer.getBackground(); - if (item.isCommentedOut()) { + if (item.isCommentedOut() || item instanceof EmptyEventBrick) { colorAsCommentedOut(background); } else { background.clearColorFilter(); diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/NewSpriteDialogFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/NewSpriteDialogFragment.kt new file mode 100644 index 00000000000..7948e1be96c --- /dev/null +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/NewSpriteDialogFragment.kt @@ -0,0 +1,191 @@ +/* + * Catroid: An on-device visual programming system for Android devices + * Copyright (C) 2010-2021 The Catrobat Team + * () + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * An additional term exception under section 7 of the GNU Affero + * General Public License, version 3, is available at + * http://developer.catrobat.org/license_additional_term + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.catrobat.catroid.ui.recyclerview.dialog + +import android.app.Dialog +import android.content.ContentResolver +import android.content.DialogInterface +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.preference.PreferenceManager +import android.util.Log +import android.view.View +import android.widget.CompoundButton +import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.widget.SwitchCompat +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment +import org.catrobat.catroid.ProjectManager +import org.catrobat.catroid.R +import org.catrobat.catroid.common.BrickValues +import org.catrobat.catroid.common.Constants +import org.catrobat.catroid.common.LookData +import org.catrobat.catroid.common.SharedPreferenceKeys.NEW_SPRITE_VISUAL_PLACEMENT_KEY +import org.catrobat.catroid.content.Scene +import org.catrobat.catroid.content.Sprite +import org.catrobat.catroid.io.StorageOperations +import org.catrobat.catroid.ui.SpriteActivity.EXTRA_X_TRANSFORM +import org.catrobat.catroid.ui.SpriteActivity.EXTRA_Y_TRANSFORM +import org.catrobat.catroid.ui.SpriteActivity.REQUEST_CODE_VISUAL_PLACEMENT +import org.catrobat.catroid.ui.recyclerview.dialog.textwatcher.DuplicateInputTextWatcher +import org.catrobat.catroid.ui.recyclerview.fragment.SpriteListFragment +import org.catrobat.catroid.utils.Utils +import org.catrobat.catroid.visualplacement.VisualPlacementActivity +import java.io.File +import java.io.IOException + +class NewSpriteDialogFragment( + private val lookDataName: String, + private val lookFileName: String, + private val contentResolver: ContentResolver, + private val uri: Uri, + private val currentFragment: Fragment +) : DialogFragment() { + + private var visuallyPlaceSwitch: SwitchCompat? = null + private var placeVisuallyTextView: TextView? = null + private var isPlaceVisually = true + private lateinit var sprite: Sprite + + companion object { + val TAG: String = NewSpriteDialogFragment::class.java.simpleName + } + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + + val view = View.inflate(activity, R.layout.dialog_new_sprite, null) + val currentScene = ProjectManager.getInstance().currentlyEditedScene + + val builder = context?.let { TextInputDialog.Builder(it) } + builder?.setHint(getString(R.string.sprite_name_label)) + ?.setText(lookDataName) + ?.setTextWatcher(DuplicateInputTextWatcher(currentScene.spriteList)) + ?.setPositiveButton( + getString(R.string.ok) + ) { dialog: DialogInterface?, textInput: String? -> + sprite = Sprite(textInput) + currentScene.addSprite(sprite) + addLookDataToSprite(currentScene, textInput) + + if (currentFragment is SpriteListFragment) { + currentFragment.notifyDataSetChanged() + } + if (isPlaceVisually) { + startVisualPlacementActivity() + } + } + + setupToggleButtonListener(view) + + builder?.setTitle(R.string.new_sprite_dialog_title) + ?.setNegativeButton(R.string.cancel) { dialog: DialogInterface?, which: Int -> + try { + if (Constants.MEDIA_LIBRARY_CACHE_DIR.exists()) { + StorageOperations.deleteDir(Constants.MEDIA_LIBRARY_CACHE_DIR) + } + } catch (e: IOException) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } + + return builder + ?.setView(view) + ?.setNegativeButton(R.string.cancel, null) + ?.create() as AlertDialog + } + + private fun addLookDataToSprite(currentScene: Scene?, textInput: String?) { + try { + val imageDirectory = File( + currentScene?.directory, + Constants.IMAGE_DIRECTORY_NAME + ) + val file = StorageOperations.copyUriToDir( + contentResolver, uri, + imageDirectory, + lookFileName + ) + Utils.removeExifData(imageDirectory, lookFileName) + val lookData = LookData(textInput, file) + if (lookData.imageMimeType == null) { + imgFormatNotSupportedDialog() + currentScene?.removeSprite(sprite) + } else { + sprite.lookList?.add(lookData) + lookData.collisionInformation.calculate() + } + } catch (e: IOException) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } + + private fun setupToggleButtonListener(view: View) { + visuallyPlaceSwitch = view.findViewById(R.id.place_visually_sprite_switch) + placeVisuallyTextView = view.findViewById(R.id.place_visually_textView) + + PreferenceManager.getDefaultSharedPreferences(context) + .getBoolean(NEW_SPRITE_VISUAL_PLACEMENT_KEY, true).apply { + visuallyPlaceSwitch?.isChecked = this + visualTextViewVisibility(this) + } + + visuallyPlaceSwitch?.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean -> + visualTextViewVisibility(isChecked) + PreferenceManager.getDefaultSharedPreferences(activity) + .edit() + .putBoolean(NEW_SPRITE_VISUAL_PLACEMENT_KEY, isPlaceVisually) + .apply() + } + } + + private fun visualTextViewVisibility(isVisible: Boolean) { + isPlaceVisually = isVisible + placeVisuallyTextView?.visibility = if (isVisible) { + View.VISIBLE + } else { + View.GONE + } + } + + private fun startVisualPlacementActivity() { + ProjectManager.getInstance().currentSprite = sprite + val intent = Intent(requireContext(), VisualPlacementActivity()::class.java) + intent.putExtra(EXTRA_X_TRANSFORM, BrickValues.X_POSITION) + intent.putExtra(EXTRA_Y_TRANSFORM, BrickValues.Y_POSITION) + activity?.startActivityForResult(intent, REQUEST_CODE_VISUAL_PLACEMENT) + } + + private fun imgFormatNotSupportedDialog() { + val alertDialogBuilder = context?.let { + AlertDialog.Builder(it) + .setMessage(getString(R.string.Image_format_not_supported)) + .setPositiveButton(getString(R.string.ok)) { dialog: DialogInterface, which: Int -> + dialog.cancel() + } + } + val alertDialog = alertDialogBuilder?.create() + alertDialog?.show() + } +} diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/LookListFragment.java b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/LookListFragment.java index 9cfbdfb3b08..c029f90cf24 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/LookListFragment.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/LookListFragment.java @@ -167,6 +167,7 @@ public void onDestroy() { Activity activity = getActivity(); if (activity instanceof SpriteActivity) { ((SpriteActivity) activity).setUndoMenuItemVisibility(false); + ((SpriteActivity) activity).checkForChange(); ((SpriteActivity) activity).showUndo(false); } } diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt index 7d0f749306f..8676236362f 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt @@ -288,6 +288,7 @@ class MainMenuFragment : Fragment(), override fun onClick(view: View) { when (view.id) { R.id.image_view, + R.id.projectImageView, R.id.editProject -> { viewModel.setIsLoading(true) val projectDir = File( diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ProjectListFragment.java b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ProjectListFragment.java index 27df424e53d..9e4ffcb53c8 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ProjectListFragment.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ProjectListFragment.java @@ -290,6 +290,7 @@ protected void deleteItems(List selectedItems) { for (ProjectData item : selectedItems) { try { + ProjectManager.getInstance().deleteDownloadedProjectInformation(item.getName()); StorageOperations.deleteDir(item.getDirectory()); } catch (IOException e) { Log.e(TAG, Log.getStackTraceString(e)); diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ScriptFragment.java b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ScriptFragment.java index 96008669405..dfb54d986c4 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ScriptFragment.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ScriptFragment.java @@ -381,7 +381,10 @@ public void notifyDataSetChanged() { } public boolean isCurrentlyMoving() { - return listView.isCurrentlyMoving(); + if (listView != null) { + return listView.isCurrentlyMoving(); + } + return false; } public void highlightMovingItem() { @@ -854,7 +857,9 @@ public void loadProjectAfterUndoOption() { @Override public void onLoadFinished(boolean success) { ProjectManager.getInstance().setCurrentSceneAndSprite(currentSceneName, currentSpriteName); - loadVariables(); + if (checkVariables()) { + loadVariables(); + } refreshFragmentAfterUndo(); } @@ -887,11 +892,11 @@ private void loadVariables() { Sprite currentSprite = projectManager.getCurrentSprite(); Project project = projectManager.getCurrentProject(); - project.setUserVariables(savedUserVariables); - project.setMultiplayerVariables(savedMultiplayerVariables); - project.setUserLists(savedUserLists); - currentSprite.setUserVariables(savedLocalUserVariables); - currentSprite.setUserLists(savedLocalLists); + project.restoreUserDataValues(project.getUserVariables(), savedUserVariables); + project.restoreUserDataValues(project.getMultiplayerVariables(), savedMultiplayerVariables); + project.restoreUserDataValues(project.getUserLists(), savedUserLists); + currentSprite.restoreUserDataValues(currentSprite.getUserVariables(), savedLocalUserVariables); + currentSprite.restoreUserDataValues(currentSprite.getUserLists(), savedLocalLists); } private void refreshFragmentAfterUndo() { diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.java b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.java index f6dd2918eac..7736f0b54a5 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.java @@ -115,6 +115,7 @@ boolean shouldShowEmptyView() { public void onResume() { initializeAdapter(); super.onResume(); + SnackbarUtil.showHintSnackbar(getActivity(), R.string.hint_objects); Project currentProject = ProjectManager.getInstance().getCurrentProject(); String title; @@ -179,7 +180,6 @@ public void onPositiveButtonClick(DialogInterface dialog, String textInput) { @Override protected void initializeAdapter() { - SnackbarUtil.showHintSnackbar(getActivity(), R.string.hint_objects); sharedPreferenceDetailsKey = SHOW_DETAILS_SPRITES_PREFERENCE_KEY; List items = ProjectManager.getInstance().getCurrentlyEditedScene().getSpriteList(); adapter = new MultiViewSpriteAdapter(items); diff --git a/catroid/src/main/java/org/catrobat/catroid/utils/SnackbarUtil.java b/catroid/src/main/java/org/catrobat/catroid/utils/SnackbarUtil.java index cf4ffc52198..f4e1065413a 100644 --- a/catroid/src/main/java/org/catrobat/catroid/utils/SnackbarUtil.java +++ b/catroid/src/main/java/org/catrobat/catroid/utils/SnackbarUtil.java @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2018 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -38,8 +38,11 @@ import java.util.Set; import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; +import static org.catrobat.catroid.common.SharedPreferenceKeys.DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY; + public final class SnackbarUtil { private static final int MAX_LINES = 5; @@ -53,27 +56,35 @@ private SnackbarUtil() { public static void showHintSnackbar(final Activity activity, @StringRes int resourceId) { final String messageId = activity.getResources().getResourceName(resourceId); - if (!wasHintAlreadyShown(activity, messageId) && areHintsEnabled(activity)) { - View contentView = activity.findViewById(android.R.id.content); - if (contentView == null) { - return; - } + if (areHintsEnabled(activity) && !wasHintDialogAlreadyShown(activity)) { + showDisableHintsDialog(activity, resourceId); + } else if (!wasHintAlreadyShown(activity, messageId) && areHintsEnabled(activity)) { + hintSnackbar(activity, resourceId); + } + } + + public static void hintSnackbar(Activity activity, @StringRes int resourceId) { + final String messageId = activity.getResources().getResourceName(resourceId); - Snackbar snackbar = Snackbar.make(contentView, resourceId, Snackbar.LENGTH_INDEFINITE); - snackbar.setAction(R.string.got_it, new View.OnClickListener() { - @Override - public void onClick(View v) { - setHintShown(activity, messageId); - } - }); - snackbar.setActionTextColor(ContextCompat.getColor(activity, R.color.solid_black)); - View snackbarView = snackbar.getView(); - TextView textView = snackbarView.findViewById(com.google.android.material.R.id.snackbar_text); - textView.setMaxLines(MAX_LINES); - textView.setTextColor(ContextCompat.getColor(activity, R.color.solid_white)); - snackbarView.setBackgroundColor(ContextCompat.getColor(activity, R.color.snackbar)); - snackbar.show(); + View contentView = activity.findViewById(android.R.id.content); + if (contentView == null) { + return; } + + Snackbar snackbar = Snackbar.make(contentView, resourceId, Snackbar.LENGTH_INDEFINITE); + snackbar.setAction(R.string.got_it, new View.OnClickListener() { + @Override + public void onClick(View v) { + setHintShown(activity, messageId); + } + }); + snackbar.setActionTextColor(ContextCompat.getColor(activity, R.color.solid_black)); + View snackbarView = snackbar.getView(); + TextView textView = snackbarView.findViewById(com.google.android.material.R.id.snackbar_text); + textView.setMaxLines(MAX_LINES); + textView.setTextColor(ContextCompat.getColor(activity, R.color.solid_white)); + snackbarView.setBackgroundColor(ContextCompat.getColor(activity, R.color.snackbar)); + snackbar.show(); } public static void setHintShown(Activity activity, String messageId) { @@ -97,4 +108,43 @@ private static Set getStringSetFromSharedPreferences(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); return new HashSet<>(prefs.getStringSet(SnackbarUtil.SHOWN_HINT_LIST, new HashSet())); } + + public static void setHintDialogShown(Activity activity) { + PreferenceManager.getDefaultSharedPreferences(activity) + .edit() + .putBoolean(DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY, true) + .apply(); + } + + public static boolean wasHintDialogAlreadyShown(Activity activity) { + return PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(DISABLE_HINTS_DIALOG_SHOWN_PREFERENCE_KEY, false); + } + + public static boolean showDisableHintsDialog(final Activity activity, @StringRes int resourceId) { + new AlertDialog.Builder(activity) + .setTitle(R.string.dialog_disable_hints_title) + .setMessage(R.string.dialog_disable_hints_text) + .setPositiveButton(R.string.dialog_disable_hints_button_show, + (dialog, id) -> handleShowHints(activity, resourceId)) + .setNegativeButton(R.string.dialog_disable_hints_button_hide, + (dialog, id) -> handleHideHints(activity)) + .setCancelable(false) + .show(); + return true; + } + + protected static void handleHideHints(Activity activity) { + SharedPreferences sharedPreferencesSetFalse = + PreferenceManager.getDefaultSharedPreferences(activity); + + sharedPreferencesSetFalse.edit() + .putBoolean(SettingsFragment.SETTINGS_SHOW_HINTS, false) + .apply(); + setHintDialogShown(activity); + } + + protected static void handleShowHints(Activity activity, @StringRes int resourceId) { + setHintDialogShown(activity); + hintSnackbar(activity, resourceId); + } } diff --git a/catroid/src/main/java/org/catrobat/catroid/utils/TextBlockUtil.java b/catroid/src/main/java/org/catrobat/catroid/utils/TextBlockUtil.java index 6cb3e63f3e5..53c7b759a79 100644 --- a/catroid/src/main/java/org/catrobat/catroid/utils/TextBlockUtil.java +++ b/catroid/src/main/java/org/catrobat/catroid/utils/TextBlockUtil.java @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2020 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -102,13 +102,13 @@ public static Point getCenterCoordinates(int index) { float aspectRatio = (float) imageWidth / imageHeight; if (ProjectManager.getInstance().isCurrentProjectLandscapeMode()) { - float relativeY = textBlockBounds.exactCenterX() / imageWidth; - relativeY = invertAxis ? relativeY : 1 - relativeY; + float relativeX = textBlockBounds.exactCenterX() / imageWidth; + relativeX = invertAxis ? 1 - relativeX : relativeX; return coordinatesFromRelativePosition( + relativeX, + SCREEN_WIDTH, 1 - textBlockBounds.exactCenterY() / imageHeight, - SCREEN_WIDTH / aspectRatio, - relativeY, - (float) SCREEN_WIDTH + (float) SCREEN_WIDTH / aspectRatio ); } else { float relativeX = textBlockBounds.exactCenterX() / imageHeight; diff --git a/catroid/src/main/java/org/catrobat/catroid/web/ProjectDownloader.kt b/catroid/src/main/java/org/catrobat/catroid/web/ProjectDownloader.kt index 17e5895df14..e5b72a83a3d 100644 --- a/catroid/src/main/java/org/catrobat/catroid/web/ProjectDownloader.kt +++ b/catroid/src/main/java/org/catrobat/catroid/web/ProjectDownloader.kt @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2019 The Catrobat Team + * Copyright (C) 2010-2021 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -32,6 +32,7 @@ import android.os.ResultReceiver import android.util.Log import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AppCompatActivity +import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.scratchconverter.Client.ProjectDownloadCallback import org.catrobat.catroid.transfers.project.ProjectDownloadService @@ -141,6 +142,7 @@ class ProjectDownloader( } SUCCESS_CODE -> { callbackWeakReference.get()?.onDownloadFinished(projectName, url) + ProjectManager.getInstance().addNewDownloadedProject(projectName) queue.finished(projectName) } ERROR_CODE -> queue.finished(projectName) diff --git a/catroid/src/main/res/drawable-hdpi/google_playstore_logo.png b/catroid/src/main/res/drawable-hdpi/google_playstore_logo.png new file mode 100644 index 00000000000..f8793ab5859 Binary files /dev/null and b/catroid/src/main/res/drawable-hdpi/google_playstore_logo.png differ diff --git a/catroid/src/main/res/drawable-hdpi/huawei_app_gallery_logo.png b/catroid/src/main/res/drawable-hdpi/huawei_app_gallery_logo.png new file mode 100644 index 00000000000..f8df02869e7 Binary files /dev/null and b/catroid/src/main/res/drawable-hdpi/huawei_app_gallery_logo.png differ diff --git a/catroid/src/main/res/drawable-nodpi/pocket_code.jpg b/catroid/src/main/res/drawable-nodpi/pocket_code.jpg index 0a056f451dd..521d2ac2cff 100644 Binary files a/catroid/src/main/res/drawable-nodpi/pocket_code.jpg and b/catroid/src/main/res/drawable-nodpi/pocket_code.jpg differ diff --git a/catroid/src/main/res/layout/activity_standalone_advertising.xml b/catroid/src/main/res/layout/activity_standalone_advertising.xml index f94ad085f20..19481ddb1b7 100644 --- a/catroid/src/main/res/layout/activity_standalone_advertising.xml +++ b/catroid/src/main/res/layout/activity_standalone_advertising.xml @@ -22,58 +22,126 @@ ~ along with this program. If not, see . --> - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/catroid/src/main/res/layout/brick_set_thread_color.xml b/catroid/src/main/res/layout/brick_set_thread_color.xml new file mode 100644 index 00000000000..47cf69b50c3 --- /dev/null +++ b/catroid/src/main/res/layout/brick_set_thread_color.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catroid/src/main/res/layout/dialog_new_sprite.xml b/catroid/src/main/res/layout/dialog_new_sprite.xml new file mode 100644 index 00000000000..c6169d5790c --- /dev/null +++ b/catroid/src/main/res/layout/dialog_new_sprite.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + diff --git a/catroid/src/main/res/layout/dialog_upload_unchanged_project.xml b/catroid/src/main/res/layout/dialog_upload_unchanged_project.xml new file mode 100644 index 00000000000..8c83220cafd --- /dev/null +++ b/catroid/src/main/res/layout/dialog_upload_unchanged_project.xml @@ -0,0 +1,48 @@ + + + + + + + + diff --git a/catroid/src/main/res/values-af/strings.xml b/catroid/src/main/res/values-af/strings.xml index 8204bca42b1..278edb26031 100644 --- a/catroid/src/main/res/values-af/strings.xml +++ b/catroid/src/main/res/values-af/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ar/strings.xml b/catroid/src/main/res/values-ar/strings.xml index 34ab4b13583..a0f04181559 100644 --- a/catroid/src/main/res/values-ar/strings.xml +++ b/catroid/src/main/res/values-ar/strings.xml @@ -102,6 +102,10 @@ تم إنشاؤها بواسطة تفاصيل حول هذا التطبيق مزيد من التطبيقات في متجر جوجل بلي + عذرًا! فشل في فتح متجر تطبيقات Huawei ، + الرجاء معاودة المحاولة في وقت لاحق. + متجرجوجل + معرض تطبيقات هواوي وسوم NFC @@ -723,17 +727,6 @@ وغيرها من الخدمات. يرجى الاطلاع على الرابط أدناه للحصول على صياغته الدقيقة.\n شروط الاستخدام والخدمات - - شروط الاستخدام والخدمات لـ بوكت كود - أنت على وشك استخدام هذا التطبيق جنبا إلى جنب مع البارد - الطائرة بدون طيار 2.0. نذكركم بشدة بالتقيد بكل من شروط الاستخدام والخدمات في البارد وكاتروبات. - لاتذكرني مرة أخرى. - - - أنت على وشك استخدام هذا التطبيق مع - Parrot Jumping Sumo. نحن نذكركم بشدة بالتقيد بكل من شروط استخدام الببغاء وكاتروبات و - خدمات. - مرحبا! لاستخدام هذا التطبيق، يرجى قبول @@ -850,8 +843,6 @@ المكون غير متوفر للأسف هذا البرنامج لا يعمل على الجهاز الخاص بك. المكونات التالية غير متوفرة: \n\n - جهاز أخر متصل بـ Jumping Sumo. تأكد من أنك - المتحكم الوحيد بالطائرة بدون طيار. \u2022 اهتزاز\n \u2022 جهاز استشعار التسارع\n \u2022 جهاز استشعار الميل\n @@ -861,7 +852,6 @@ \u2022 الكاميرا الخلفية\n \u2022 كشف الوجه\n \u2022 كشف النص\n - \u2022 Jumping Sumo\n \u2022 الكاميرا الأمامية \n \u2022 الكاميرا\n \u2022 ضوء الفلاش\n @@ -1074,6 +1064,7 @@ كتابة بيانات التطريز إلى الملف التطريز.dst ابدأ + اضبط لون الخيط على إعادة ضبط الموقت @@ -1362,17 +1353,7 @@ جاري التنزيل تم التنزيل بنجاح "فتح" - تحذير. طاقة البطارية منخفضة. الوضع الحالي %d الحجم: - البطارية منخفضة (الهبوط الأوتوماتيكي). - كاميرا واحدة أو أكثر لا تعطي إستجابة. - استشعار الموجات فوق الصوتية لا يستجيب. - زاوية أويلر الخاصة بالطائرة بدون طيار ارتفعت كثيراً. تم إيقاف المحركات لتفادي أي سلوك خطير. - واحد أو أكثر من المحركات توقفت بسبب البيئة. - طاقة البطارية منخفض جداً للإنطلاق مرة أخرى. - استشعار الموجات فوق الصوتية لا يمكنه تحديد إرتفاع الطائرة بدون طيار. - لا يوجد تقدير لسرعة الكاميرا المواجهة السفلية. - حالات الطوارئ يحتاج هذا التطبيق الحصول على الإذونات المطلوبة ليعمل بشكل مناسب. مثلاً., @@ -1399,18 +1380,6 @@ قم بتغيير شيئاً ما ثم حاول مجدداً. حدث خطأ أثناء إضافة هذه اللبّنة البرمجية حدث خطأ أثناء نسخ هذه اللبّنة البرمجية - لا يمكن العثور على الطائرة بدون طيار 2.0. - قم بإيصال واي فاي بالطائرة بدون طيار2.0، ثم حاول مرة أخرى. - بطارية الطائرة بدون طيار منخفضة:%d%% - أدخل بطارية مشحونة وحاول مرة أخرى. - لا يمكننا تشغيل مشروع Jumping Sumo على جهازك. - لا يمكن العثور على Jumping Sumo - قم بإيصال واي فاي بـ Jumping Sumo ثم حاول مرة أخرى. - بطارية Jumping Sumo منخفضة - أدخل بطارية مشحونة وحاول مرة أخرى. - لا يوجد دعم لـ Jumping Sumo - لا يوجد دعم لطائرة بدون طيار2.0. - لا يمكننا تشغيل مشروع الطائرة بدون طيار 2.0 على الجهاز الخاص بك. إعادة تسمية مشروع \"غير متوافق\" هو غير ممكن. حدث خطأ أثناء مشاركة ملف التطريز. حدث خطأ أثناء كتابة ملف التطريز. @@ -2006,6 +1975,15 @@ مرة أخرى! عرض البرنامج + + المشروع الذي تحاول تحميله موجود بالفعل + النظام الأساسي للمجتمع بالشكل نفسه تمامًا. يرجى تغيير مشروعك ، بشكل مثالي عن طريق + تحسينه ، قبل تحميل مشروعك المُعاد مزجه. + من فضلك ضع في اعتبارك إضافة بعض الكلمات اللطيفة إلى الأصل + المؤلف في قسم الاعتمادات على موقع المجتمع أو في خيارات المشروع. يرجى الملاحظة + أن المستخدم سيتلقى إشعارًا بعد نجاح التحميل. + لمعرفة المزيد حول عمليات إعادة المزج ، الرجاء زيارة%1s. + فهمت ذلك التفعيل لإظهار التلميحات @@ -2020,6 +1998,14 @@ يتكون البرنامج الخاص بك من كائنات مختلفة يمكن لها أن تتفاعل مع بعضها البعض. لإضافة كائن جديد أنقر على الرمز \"+\". + + تلميحات المعرض؟ + تزودك التلميحات بمعلومات مفيدة + أثناء إنشاء مشروعك الأول. \n\n يمكن تغيير إمكانية رؤية التلميحات في + الإعدادات. + يخفي + تبين + @@ -2032,6 +2018,9 @@ تحرير القيمة مستخدم مؤخرا + مكان بصري + سيُطلب منك وضع الممثل أو الكائن الجديد على + المسرح. لا يوجد متغير محدد diff --git a/catroid/src/main/res/values-az/strings.xml b/catroid/src/main/res/values-az/strings.xml index 22fc3c15e7c..aba2846572d 100644 --- a/catroid/src/main/res/values-az/strings.xml +++ b/catroid/src/main/res/values-az/strings.xml @@ -104,6 +104,10 @@ tərəfindən yaradılmışdır. Bu app haqda ətraflı məlumatlar Google Play-də əlavə app-lər + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Mənə bir daha xatırlatma. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-bg/strings.xml b/catroid/src/main/res/values-bg/strings.xml index c24d8daea4f..e5675442cdd 100644 --- a/catroid/src/main/res/values-bg/strings.xml +++ b/catroid/src/main/res/values-bg/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-bn/strings.xml b/catroid/src/main/res/values-bn/strings.xml index 528282205e1..b944f8783c9 100644 --- a/catroid/src/main/res/values-bn/strings.xml +++ b/catroid/src/main/res/values-bn/strings.xml @@ -104,6 +104,10 @@ সঙ্গে তৈরি এই অ্যাপ্লিকেশন সম্পর্কে বিস্তারিত অ্যাপ স্টোরের আরও অ্যাপস + Whoops! Failed to open Huawei AppGallery, + please try again later. + গুগল প্লে + Huawei App Gallery NFC tags @@ -575,14 +579,6 @@ ক্যাট্রোব্যাট প্রকল্পের দেওয়া পকেট কোড এবং অন্যান্য এক্সিকিউটেবল ব্যবহার করার অনুমতি দেওয়ার জন্য, আপনাকে অবশ্যই আমাদের ব্যবহারের শর্তাদির সাথে সম্মত হতে হবে এবং আপনি পকেট কোড এবং আমাদের অন্যান্য এক্সিকিউটেবল ব্যবহার করার সময় সেগুলি কঠোরভাবে অনুসরণ করতে হবে। সঠিক সূত্রের জন্য নীচের লিঙ্কটি দেখুন। ব্যবহার এবং সেবার শর্তাদি - - ব্যবহার এবং সেবার শর্তাদি - আপনি পারত এআর.ড্রোন 2.0 এর সাথে একত্রে এই অ্যাপ্লিকেশনটি ব্যবহার করতে চলেছেন। আমরা আপনাকে প্রবলভাবে স্মরণ করিয়ে দিচ্ছি যে পারত এবং ক্যাট্রোব্যাট উভয় ব্যবহারের শর্তাদি এবং পরিষেবাদি মেনে চলুন। - আমাকে আবার মনে করিয়ে দিবেন না - - - আপনি পারত জাম্পিং সুমো এর সাথে একত্রে এই অ্যাপ্লিকেশনটি ব্যবহার করতে চলেছেন। আমরা আপনাকে প্রবলভাবে স্মরণ করিয়ে দিচ্ছি যে পারত এবং ক্যাট্রোব্যাট উভয় ব্যবহারের শর্তাদি এবং পরিষেবাদি মেনে চলুন। - স্বাগতম To use this app, please accept our @@ -693,7 +689,6 @@ পাঠ্য থেকে স্পিচ ইঞ্জিন ইনস্টল করা হয়নি! আপনি কি এটি ইনস্টল করতে চান? উপাদানটি নেই দুর্ভাগ্যক্রমে এই প্রজেক্টটি আপনার ডিভাইসে কাজ করে না। নিম্নলিখিত উপাদানগুলি অনুপস্থিত: - আরেকটি ডিভাইস জাম্পিং সুমোর সাথে সংযুক্ত। নিশ্চিত হন যে আপনিই ড্রোনটির সাথে সংযুক্ত আছেন। \u2022 Vibration\n \u2022 ত্বরণ সেন্সর \n \u2022 প্রবণতা সেন্সর \n @@ -703,7 +698,6 @@ \u2022 পেছনের ক্যামেরা \n \u2022 Face detection\n \u2022 Text detection\n - \u2022 জাম্পিং সুমো \n \u2022 সামনের ক্যামেরা \n \u2022 Camera\n \u2022 Flashlight\n @@ -908,6 +902,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1176,17 +1171,7 @@ আপলোড চলছে ডাউনলোড সফল "খুলুন" - মনোযোগ. ব্যাটারি স্বল্প. বর্তমান অবস্থা %d আকার - ব্যাটারি কম (স্বয়ংক্রিয় অবতরণ)। - এক বা একাধিক ক্যামেরা সাড়া দিচ্ছে না। - আল্ট্রাসাউন্ড সেন্সর সাড়া দিচ্ছে না। - এআর.ড্রোন ২.০ ইউলারের কোণগুলি খুব বেশি গেছে। মোটরগুলি বিপজ্জনক আচরণ রোধ করতে বন্ধ করে দেয়। - এক বা একাধিক মোটর পরিবেশ দ্বারা বন্ধ ছিল। - ব্যাটারি খুব কম আবার খুলে ফেলতে। - আল্ট্রাসাউন্ড সেন্সর এআর.ড্রোন ২.০ উচ্চতা নির্ধারণ করতে পারে না। - নীচের মুখের ক্যামেরা থেকে গতির কোনও অনুমান নেই। - জরুরী এই অ্যাপ্লিকেশনটির সঠিকভাবে কাজ করার জন্য অনুরোধ করা অনুমতিগুলি দরকার। উদাহরণস্বরূপ, ক্যামেরা ব্রিক ডিভাইসের ক্যামেরায় অ্যাক্সেস প্রয়োজন, \"অবস্থান\" সূত্র উপাদানটি ডিভাইসের ভূ-অবস্থান সেন্সরটিতে অ্যাক্সেসের প্রয়োজন, এবং স্থানীয় মেমরি থেকে এবং আমদানি ও রফতানি করতে অ্যাপ্লিকেশনটিকে এটি পড়তে এবং লেখার অ্যাক্সেসের প্রয়োজন । আপনি সর্বদা আপনার ডিভাইসের সেটিংসের মাধ্যমে অনুমতিগুলি পরিবর্তন করতে পারেন। @@ -1207,18 +1192,6 @@ আপনি একটি অপরিবর্তিত উদাহরণ প্রজেক্ট আপলোড করতে পারবেন না। দয়া করে কিছু পরিবর্তন করুন এবং আবার চেষ্টা করুন। এই ব্রিকটি যুক্ত করার সময় কিছু ভুল হয়েছে। এই ব্রিকটি অনুলিপি করার সময় কিছু ভুল হয়েছে। - এআর.ড্রোন ২.০ খুঁজে পাচ্ছেন না। - আপনার ওয়াইফাইটি এআর.ড্রোন ২.০ এর সাথে সংযুক্ত করুন এবং আবার চেষ্টা করুন। - এআর.ড্রোন ২.০ ব্যাটারি কম: %d%% - চার্জযুক্ত ব্যাটারি প্রবেশ করান এবং আবার চেষ্টা করুন। - আমরা আপনার ডিভাইসে একটি জাম্পিং সুমো প্রজেক্ট চালাতে পারি না। - জাম্পিং সুমো খুঁজে পাচ্ছেন না - আপনার ওয়াইফাইটি জাম্পিং সুমোর সাথে সংযুক্ত করুন এবং আবার চেষ্টা করুন। - জাম্পিং সুমোর ব্যাটারি কম - চার্জযুক্ত ব্যাটারি প্রবেশ করান এবং আবার চেষ্টা করুন। - জাম্পিং সুমো সমর্থন নেই - এআর.ড্রোন 2.0 সমর্থন নেই। - আমরা আপনার ডিভাইসে একটি এআর.ড্রোন ২.০ প্রজেক্ট চালাতে পারি না। একটি অসঙ্গত প্রকল্পের নামকরণ সম্ভব নয়। সূচিকর্ম ফাইলটি শেয়ার করার সময় কিছু ভুল হয়েছে। Something went wrong while writing the embroidery file. @@ -1815,6 +1788,15 @@ আপলোড ব্যর্থ হয়েছে। আপনার সংযোগ পরীক্ষা করুন এবং আবার চেষ্টা করুন। প্রজেক্টি দেখান + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + বুঝেছি ইঙ্গিতগুলি প্রদর্শন করতে সক্ষম করুন @@ -1826,6 +1808,14 @@ এখানে আপনি আপনার অভিনেতা বা অবজেক্টে নতুন শব্দ যোগ করতে পারেন। শব্দ বিভাগ থেকে একটি ব্রিক ব্যবহার মনে রাখবেন। আপনার প্রোগ্রামে বিভিন্ন অভিনেতা এবং অবজেক্ট রয়েছে যা একে অপরের সাথে ইন্টারঅ্যাক্ট করতে পারে। নতুন অভিনেতা বা বস্তু যুক্ত করতে, \"+\" চিহ্নটি আলতো চাপুন। + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1838,6 +1828,9 @@ সম্পাদনা করুন Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-bs/strings.xml b/catroid/src/main/res/values-bs/strings.xml index 3141e5ca8b8..6d46722a8fb 100644 --- a/catroid/src/main/res/values-bs/strings.xml +++ b/catroid/src/main/res/values-bs/strings.xml @@ -104,6 +104,10 @@ Kreirano sa Podalic o aplikaciji Više aplikacija u App prodavnici + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -622,17 +626,6 @@ Ako želite koristiti Pocket Code i ostale izvršne datoteke ponuđene od strane Catrobat projekta, morate pristati na naše uvjete korištenja i strogo ih slijediti kada koristite Pocket Code i naše ostale izvršne datoteke. Molimo vas da pogledate link ispod za njihovu preciznu formulaciju. \n Uslovi korištenja - - Uslovi korištenja - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Nemoj me podsjećati. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Dobro došli! To use this app, please accept our @@ -746,8 +739,6 @@ Tekst-U-Govor mašina nije instalirana!\nŽelite li je instalirati? Komponenta nije dostupna Nažalost ovaj projekat ne radi na Vašem uređaju. Sljedeće komponente nisu dostupne: \n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Senzor ubrzanja\n \u2022 Senzor nagiba\n @@ -757,7 +748,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Prednja kamera\n \u2022 Camera\n \u2022 Flashlight\n @@ -964,6 +954,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1237,18 +1228,7 @@ Preuzimanje u toku Preuzimanje je uspjelo "Otvori " - Pažnja. Baterija je slaba. Trenutni status je %d Veličina: - Baterija je slaba (automatsko slijetanje). - Jedna ili više kamera ne odgovaraju. - Ultrazvučni senzor ne odgovara. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - Okruženje je zaustavilo jedan ili više motora. - Battery is too low to take off again. - Ultrazvučni senzor ne može odrediti visinu AR. drona 2.0. - No speed estimation from bottom facing camera. - Hitan slučaj This app needs the requested permissions to function properly. E.g., the @@ -1272,18 +1252,6 @@ needs read and write access to it. You can always change permissions through you Ne možete objaviti nepromijenjen primjer projekat. Molimo Vas da promijenite nešto i pokušate ponovo. Došlo je do greške prilikom dodavanja ovog bloka Došlo je do greške prilikom kopiranja ovog bloka - Nije moguće pronaći AR.Drone 2.0. - Povežite svoj WiFi sa AR.drone-om i pokušajte ponovo. - AR. dron 2.0 baterija slaba: %d%% - Ubaci napunjenu bateriju i pokušaj ponovo. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo baterija slaba - Ubaci napunjenu bateriju i pokušaj ponovo. - Nema Jumping Sumo podrške - Nema AR. dron 2.0 podrške. - Ne možemo pokrenuti AR. dron projekat na Vašem uređaju. Mijenjanje naziva neodgovarajućeg projekta nije moguće. Nešto je pošlo po zlu pri dijeljenju datoteke za vez. Something went wrong while writing the embroidery file. @@ -1893,6 +1861,15 @@ needs read and write access to it. You can always change permissions through you Preuzimanje neuspješno. Molimo da provjerite Vašu internet konekciju i pokušate ponovo! Prikaži projekat + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Razumijem Omogućeno prikazivanje savjeta @@ -1904,6 +1881,14 @@ needs read and write access to it. You can always change permissions through you Ovdje možete dodati nove zvukove za Vaše učesnike ili objekte. Zapamtite da koristite blok iz kategorije zvukova. Vaš program sadrži različite učesnike i objekte koji mogu komunicirati međusobno. Da dodate novog učesnika ili objekat, pritisnite simbol \"+\". + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1916,6 +1901,9 @@ needs read and write access to it. You can always change permissions through you Uredi Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ca/strings.xml b/catroid/src/main/res/values-ca/strings.xml index 36bdccb6363..4b6845ab52f 100644 --- a/catroid/src/main/res/values-ca/strings.xml +++ b/catroid/src/main/res/values-ca/strings.xml @@ -104,6 +104,10 @@ Creat amb Detalls d\'aquesta aplicació Més aplicacions a l\'App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Condicions d\'ús i servei - - Condicions d\'ús i servei - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-chr/strings.xml b/catroid/src/main/res/values-chr/strings.xml index 0a6238557e7..88a7b1f5246 100644 --- a/catroid/src/main/res/values-chr/strings.xml +++ b/catroid/src/main/res/values-chr/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-cs/strings.xml b/catroid/src/main/res/values-cs/strings.xml index 36564955f24..3d6ce1cd06e 100644 --- a/catroid/src/main/res/values-cs/strings.xml +++ b/catroid/src/main/res/values-cs/strings.xml @@ -104,6 +104,10 @@ Vytvořen s Podrobnosti o této aplikaci Další aplikace na Google Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -667,17 +671,6 @@ and other services. Please see the link below for their precise formulation.\n Podmínky užití a služeb - - Pocket Code podmínky užití a služeb - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Znovu nepřípomínat. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Vítej! To use this app, please accept our @@ -794,8 +787,6 @@ Komponent není k dispozici. Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Senzor zrychlení\n \u2022 Senzor sklonu\n @@ -805,7 +796,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -1015,6 +1005,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1293,18 +1284,7 @@ Probíhá stahování Staženo úspěšně "Otevřít " - Attention. Battery is low. Current status is %d Velikost: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Pohotovost This app needs the requested permissions to function properly. E.g., the @@ -1330,18 +1310,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Došlo k chybě při přidávání bloku Došlo k chybě při kopírování bloku - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Vlože nabitou baterii a opakujte akci. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Vlože nabitou baterii a opakujte akci. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Přejmenování nekompatibilní projektu není možné. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1955,6 +1923,15 @@ needs read and write access to it. You can always change permissions through you again! Zobrazit program + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Rozumím Umožní zobrazování nápovědy @@ -1970,6 +1947,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1982,6 +1967,9 @@ needs read and write access to it. You can always change permissions through you Úpravy Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-da/strings.xml b/catroid/src/main/res/values-da/strings.xml index 1440e06b9ef..d5a7ba79b83 100644 --- a/catroid/src/main/res/values-da/strings.xml +++ b/catroid/src/main/res/values-da/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download i gang Download succesfuld "Åbn" - Attention. Battery is low. Current status is %d Størrelse: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Der opstod en fejl under tilføjelse af denne Klods Der opstod en fejl under kopiering af denne Klods - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Indsæt et opladet batteri, og prøv igen. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Indsæt et opladet batteri, og prøv igen. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-de/strings.xml b/catroid/src/main/res/values-de/strings.xml index bdc6e14c351..ee4bc61c00c 100644 --- a/catroid/src/main/res/values-de/strings.xml +++ b/catroid/src/main/res/values-de/strings.xml @@ -52,11 +52,11 @@ überspringen Achtung Fehler - Lade… + Laden… Bitte warten Suche… In den Rucksack packen - www.pocketcode.org + share.catrob.at Das Projekt, das du heruntergeladen hast, hört deine Stimme im Hintergrund und sendet auch Daten an das Internet. Dies kann harmlos sein und ist notwendig @@ -84,12 +84,12 @@ Trennen - Fortsetzen + Projekt fortsetzen Neues Projekt Projekte am Gerät Hilfe Catrobat Community - Hochladen + Projekt hochladen Bewerte uns! Nutzungsbedingungen und Leistungen Datenschutz-Vereinbarung @@ -103,13 +103,17 @@ Erstellt mit Details zu dieser App Weitere Apps auf Google Play + Hoppla! Fehler beim Öffnen der Huawei Appgalerie, + bitte versuche es später erneut. + Google Play Store + Huawei App Galerie NFC-Tags Einstellungen Sprache App-Sprache auswählen - Web zugriff + Webzugriff Bearbeiten, um vertrauenswürdige Domänen hinzuzufügen oder zu entfernen Bearbeiten Sie vertrauenswürdige Domänen Bedienungshilfe @@ -256,8 +260,8 @@ konvertieren aber möglicherweise funktioniert es nicht. Anleitung Anmerkungen und Danksagungen - Veröffentlicht:\n%1$s - Zuletzt verändert:\n%1$s + Veröffentlicht: %1$s + Zuletzt verändert: %1$s Remixe Autor: @@ -267,18 +271,18 @@ Drücke um eine Beschreibung hinzuzufügen Drücken, um Notizen und Credits hinzuzufügen - Dieses Projekt wurde bereits vor %1$s konvertiert. + Du hast dieses Projekt vor %1$s konvertiert. %d Minute %d Minuten %d Stunde - %d Stunde + %d Stunden %d Tag - %d Tag + %d Tage Projekt erneut herunterladen Projekt erneut konvertieren @@ -554,7 +558,7 @@ Beispielprojekt - Projekt zusammengeführt + Zusammengeführtes Projekt Diese beiden Projekte können noch nicht zusammengeführt werden @@ -570,7 +574,7 @@ Klang hinzufügen Klang aufnehmen - Klang auswählen + Datei auswählen Komponist Notizauswahl @@ -590,16 +594,6 @@ eingehaltan werden. Für weitere Informationen zu den Nutzungsbedingungen klicken Sie auf den untenstehenden Link.\n Nutzungsbedingungen und Leistungen - - Nutzungsbedingungen und Leistungen - Du benutzt diese App gemeinsam mit Parrots - AR.Drohne 2.0. Wir möchten dich daran erinnern, die Nutzungsbedingungen und Dienstleistungen von Parrot und Catrobat einzuhalten. - Nicht nochmal erinnern. - - - Du benutzt diese App gemeinsam mit Parrots - Jumping Sumo. Wir möchten dich daran erinnern, die Nutzungsbedingungen und Dienstleistungen von Parrot und Catrobat einzuhalten. - Willkommen! Um diese App zu verwenden, akzeptieren Sie bitte unsere @@ -715,7 +709,6 @@ Komponente nicht verfügbar Leider funktioniert dieses Projekt nicht auf deinem Gerät. die folgenden Komponenten sind nicht verfügbar: \n\n - Ein anderes Gerät ist mit der Jumping Sumo verbunden. Versichere dich, dass du als einziger/e die Drohne steuerst. \u2022 Vibration\n \u2022 Beschleunigungssensor\n \u2022 Neigungssensor\n @@ -725,7 +718,6 @@ \u2022 Hintere Kamera\n \u2022 Gesichts erkennung\n \u2022 Texterkennung\n - \u2022 Jumping Sumo\n \u2022 Vordere Kamera\n \u2022 Kamera\n \u2022 Taschenlampe\n @@ -928,7 +920,8 @@ Beende aktuellen Stich Schreiben Sie Stickdaten in die Datei Stickerei.dst - nähen + vernähen + Setze auf Farbe Timer zurücksetzen @@ -974,7 +967,7 @@ Wenn der Bildschirm berührt wird Erzeuge Klon von mir - Wenn ich als Klon entstehe + Wenn ich als Klon starte Lösche diesen Klon Behaupten entspricht erwartet @@ -1187,17 +1180,7 @@ Download wird ausgeführt Download erfolgreich "Öffne " - Achtung. Akkustand ist niedrig. Derzeitiger Status %d Größe: - Akkustand ist niedrig (automatische Landung). - Eine oder mehrere Kamera(s) reagieren nicht. - Ultraschallsensor reagiert nicht. - AR. Drohnen Euler Winkel überschritten. Motoren wurden heruntergefahren, um ein Fehlverhalten zu verhindern. - Ein oder mehrere Motor(en) wurden vom Umfeld gestoppt. - Akkustand ist zu niedrig, um wieder abzuheben. - Der Ultraschallsensor kann die AR.Dronen Höhe nicht bestimmen. - Keine Geschwindigkeitsschätzung der Bodenkamera. - Notfall Diese App benötigt die angeforderten Berechtigungen, um ordnungsgemäß zu funktionieren. Beispielsweise benötigt der Kamera Baustein Zugriff auf die Kamera des Geräts, das Formelelement \"Standort\" benötigt Zugriff auf den Geolocation-Sensor des Geräts. Um Projekte aus und in den lokalen Speicher zu importieren und zu exportieren, benötigt die App Lese- und Schreibzugriff auf diesen. Du kannst Berechtigungen jederzeit über die Einstellungen deines Geräts ändern. @@ -1218,18 +1201,6 @@ ändere etwas und versuche es dann nochmals. Beim Hinzufügen des Bausteins ist ein Fehler aufgetreten Beim Kopieren des Blocks ist ein Fehler aufgetreten - AR.Drone 2.0 kann nicht gefunden werden. - Verbinde dein WiFi-Netzwerk mit der AR.Drone 2.0 und versuche es erneut. - AR.Drone 2.0 Batterie schwach: %d%% - Lege einen geladenen Akku ein und probiere es noch einmal. - Leider können wir kein Jumping Sumo Projekt auf deinem Gerät ausführen. - Jumping Sumo kann nicht gefunden werden. - Verbinde dein WiFi-Netzwerk mit der Jumping Sumo und versuche es erneut. - Jumping Sumo Batterie schwach - Lege einen geladenen Akku ein und probiere es noch einmal. - Kein Unterstützung für Jumping Sumo - Keine Unterstützung für AR.Drone 2.0. - Leider können wir kein AR.Dronen Projekt auf deinem Gerät ausführen. Es ist nicht möglich ein inkompatibles Projekt umzubenennen. Während dem Teilen der Stickdatei ist etwas schief gelaufen. Beim Schreiben der Stickdatei ist ein Fehler aufgetreten. @@ -1838,6 +1809,15 @@ Upload fehlgeschlagen. Bitte überprüfe deine Internetverbindung und versuche es erneut! Projekt anzeigen + + Das Projekt, das du hochladen möchtest, existiert bereits auf der Gemeinschaftsplattform + in genau derselben Form. Bitte ändere das Projekt, indem du es + erweiterst, bevor du dein geremixtes Projekt hochladest. + Bitte denke daran, ein paar freundliche Worte an den ursprünglichen + Autor im Abschnitt \"Credits\" auf der Community-Seite oder in den Projektoptionen hinzuzufügen. Bitte beachte + dass der Benutzer nach dem erfolgreichen Upload eine Benachrichtigung erhält. + Um mehr über Remixe zu erfahren, besuche bitte %1s. + Alles klar Aktivieren um Hinweise anzuzeigen @@ -1849,6 +1829,14 @@ Hier kannst du neue Klänge zu deiner Figur oder deinem Objekt hinzufügen. Denke daran einen Block aus der Klang-Kategorie zu verwenden. Dein Projekt besteht aus verschiedenen Figuren oder Objekten, die miteinander interagieren. Um eine neue Figur oder ein neues Objekt hinzuzufügen, tippe auf das \"+\" Symbol. + + Tipps anzeigen? + Tipps geben dir hilfreiche Informationen + während du dein erstes Projekt machst.\n\nDie Sichtbarkeit von Hinweisen kann in den + Einstellungen geändert werden. + VERSTECKEN + ZEIGEN + @@ -1861,6 +1849,9 @@ Bearbeiten Wert Zuletzt verwendet + Visuell platzieren + Du wirst aufgefordert, die neue Figur oder das Objekt auf der + Bühne zu platzieren. Keine Variable ausgewählt diff --git a/catroid/src/main/res/values-el/strings.xml b/catroid/src/main/res/values-el/strings.xml index 81796a06bfc..339ca0849ef 100644 --- a/catroid/src/main/res/values-el/strings.xml +++ b/catroid/src/main/res/values-el/strings.xml @@ -104,6 +104,10 @@ Δημιουργήθηκε με Λεπτομέρειες σχετικά με αυτή την εφαρμογή Περισσότερες εφαρμογές στο Google Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -591,17 +595,6 @@ and other services. Please see the link below for their precise formulation.\n Όροι χρήσης και υπηρεσιών - - Όροι χρήσης και υπηρεσιών - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Να μην ξαναγίνει υπενθύμιση. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -718,7 +711,6 @@ Το στοιχείο δεν είναι διαθέσιμο Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Μια άλλη συσκευή συνδέεται με το Jumping Sumo. Βεβαιωθείτε ότι, είστε ο μοναδικός ελεγκτής του Drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -728,7 +720,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -934,6 +925,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1202,18 +1194,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Μέγεθος: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1239,18 +1220,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1870,6 +1839,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1885,6 +1863,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1897,6 +1883,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-en-rAU/strings.xml b/catroid/src/main/res/values-en-rAU/strings.xml index 31c5ea47537..7fa69f31bb2 100644 --- a/catroid/src/main/res/values-en-rAU/strings.xml +++ b/catroid/src/main/res/values-en-rAU/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR. Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behaviour. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-en-rCA/strings.xml b/catroid/src/main/res/values-en-rCA/strings.xml index bb6547449d4..51a7f8fce8f 100644 --- a/catroid/src/main/res/values-en-rCA/strings.xml +++ b/catroid/src/main/res/values-en-rCA/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR. Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behaviour. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-en-rGB/strings.xml b/catroid/src/main/res/values-en-rGB/strings.xml index 363b44c2e8a..7518d6c4296 100644 --- a/catroid/src/main/res/values-en-rGB/strings.xml +++ b/catroid/src/main/res/values-en-rGB/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open " - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR. Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behaviour. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. An error occurred while adding this Brick An error occurred while copying this Brick - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-es/strings.xml b/catroid/src/main/res/values-es/strings.xml index 49198046659..6657560a1ea 100644 --- a/catroid/src/main/res/values-es/strings.xml +++ b/catroid/src/main/res/values-es/strings.xml @@ -103,6 +103,10 @@ Creado con Detalles sobre esta aplicación Más aplicaciones en Google Play + ¡Ups! No se ha podido abrir la AppGallery de Huawei, + por favor, inténtelo de nuevo más tarde. + Google Play + Galería de aplicaciones de Huawei Etiquetas NFC @@ -588,17 +592,6 @@ y otros servicios. Por favor, consulte el siguiente enlace para ver su formulación precisa.\n Términos de uso y servicios - - Términos de uso y servicios de Pocket Code - Está a punto de utilizar esta aplicación junto con el - AR.Drone 2.0 de Parrot. Te recordamos encarecidamente que debes respetar las condiciones de uso y servicios de Parrot y Catrobat. - No recordarmelo nuevamente. - - - Está a punto de utilizar esta aplicación junto con - Parrot\'s Jumping Sumo. Te recordamos encarecidamente que debes respetar las condiciones de uso y los servicios de Parrot y Catrobat. - Servicios. - ¡Bienvenido! Para utilizar esta aplicación, acepte nuestro @@ -715,7 +708,6 @@ Componente no disponible Desafortunadamente este proyecto no funciona en tu dispositivo. Los siguientes componentes no están disponibles:\n\n - Otro dispositivo está conectado al Jumping Sumo. Asegúrese de ser el único controlador del Drone. \u2022 Vibración\n \u2022 Sensor aceleración\n \u2022 Sensor inclinación\n @@ -725,7 +717,6 @@ \u2022 Escanear cámara\n \u2022 Detección de caras\n \u2022 Detección de texto\n - \u2022 Jumping Sumo\n \u2022 Cámara frontal\n \u2022 Cámara\n \u2022 Linterna\n @@ -931,6 +922,7 @@ Escribir datos de bordado a archivo bordado.dst Salvar + Establecer el color del hilo en Reset timer @@ -957,7 +949,7 @@ Cuando haya una colisión fisica con cualquier cosa - Cuando recibo + Cuando reciba Difundir Difunda y espere Continuar la escena @@ -976,7 +968,7 @@ Cuando se toca la pantalla Crear un clon de yo mismo - Cuando inicie como un clon + Cuando empiezas como un clon Eliminar este clon Asumir igual a lo esperado @@ -1199,18 +1191,7 @@ Descarga en progreso Descarga exitosa "Abrir" - Atención. La batería es baja. El estado actual es %d Tamaño: - Batería está baja (descanso automático). - Una o mas cámaras no responden. - Sensor de ultrasonido no está respondiendo. - Los ángulos AR.Drone 2.0 Euler fueron demasiado altos. Los motores se apagaron para evitar comportamientos - peligrosos. - Uno o más motores fueron detenidos por el entorno. - La batería es demasiado baja para despegar otra vez. - El sensor de ultrasonido no puede determinar la altitud de AR.Drone 2.0. - No hay estimación de velocidad de la cámara trasera. - Emergencia Esta aplicación necesita los permisos solicitados para funcionar correctamente. Por ejemplo, el bloque de cámara @@ -1235,18 +1216,6 @@ necesita acceso de lectura y escritura a ella. Siempre puedes cambiar los permis cambie algo e inténtelo de nuevo. Error al agregar este bloque Error al copiar este bloque - No se puede encontrar a AR. Drone 2.0. - Conecte el AR.Drone 2.0 a su WiFi e inténtelo de nuevo. - La batería de AR.Drone 2.0 está baja: %d%% - Inserte una batería cargada y vuelva a intentarlo. - No podemos ejecutar un proyecto de Jumping Sumo en su dispositivo. - No se puede encontrar a Jumping Sumo - Conecte Jumping Sumo a su WiFi e inténtelo de nuevo. - Batería baja de Jumping Sumo - Inserte una batería cargada y vuelva a intentarlo. - No hay soporte para Jumping Sumo - No hay soporte para AR.Drone 2.0. - No podemos ejecutar un proyecto de AR.Drone 2.0 en su dispositivo. No es posible renombrar un proyecto incompatible. Algo salió mal al compartir el archivo de bordado. Algo salió mal al escribir el archivo de bordado. @@ -1846,6 +1815,15 @@ necesita acceso de lectura y escritura a ella. Siempre puedes cambiar los permis de nuevo! Ver programa + + El proyecto que está intentando subir ya existe en + la plataforma comunitaria exactamente de la misma forma. Por favor, modifique su proyecto, idealmente + mejorándolo, antes de subir su proyecto remezclado. + Por favor, considere añadir algunas palabras amables hacia el autor original + en la sección de créditos del sitio comunitario o en las opciones del proyecto. Tenga en cuenta + que el usuario recibirá una notificación después de su carga exitosa. + Para saber más sobre las remezclas, visite %1s. + Obtenlo Activar mostrar sugerencias @@ -1860,6 +1838,14 @@ necesita acceso de lectura y escritura a ella. Siempre puedes cambiar los permis Su programa consta de diferentes actores y objetos que pueden interactuar entre ellos. Para agregar un nuevo actor o objeto pulse en el símbolo \"+\". + + ¿Mostrar pistas? + Los consejos le proporcionan información útil + mientras realiza su primer proyecto.\n\nLa visibilidad de las sugerencias puede cambiarse en los + ajustes. + OCULTAR + MOSTRAR + @@ -1872,6 +1858,9 @@ necesita acceso de lectura y escritura a ella. Siempre puedes cambiar los permis Editar Valor Usado recientemente + Colocar visualmente + Se le pedirá que coloque el nuevo actor u objeto en el + escenario. Ninguna variable seleccionada diff --git a/catroid/src/main/res/values-fa-rIR/strings.xml b/catroid/src/main/res/values-fa-rIR/strings.xml index 411cf5d4e5b..a4f56b31210 100644 --- a/catroid/src/main/res/values-fa-rIR/strings.xml +++ b/catroid/src/main/res/values-fa-rIR/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + گوگل پلی + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ دانلود در جریان است بارگيري با موفقیت انجام شد "باز کن" - Attention. Battery is low. Current status is %d اندازه: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. هنگام اضافه کردن این آجر خطایی رخ داده است هنگام کپی کردن این آجر خطایی رخ داده است - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - یک باتری پر وارد کن و دوباره امتحان کن. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - یک باتری پر وارد کن و دوباره امتحان کن. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you ويرايش Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-fa/strings.xml b/catroid/src/main/res/values-fa/strings.xml index 1a9b52555c5..f4b266da73f 100644 --- a/catroid/src/main/res/values-fa/strings.xml +++ b/catroid/src/main/res/values-fa/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + فروشگاه گوگل پلی (Google Play) + Huawei App Gallery NFC tags @@ -557,17 +561,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -685,8 +678,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -696,7 +687,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -900,6 +890,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1163,18 +1154,7 @@ دانلود در جریان است بارگيري با موفقیت انجام شد "باز کن" - Attention. Battery is low. Current status is %d اندازه: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1200,18 +1180,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. هنگام اضافه کردن این آجر خطایی رخ داده است هنگام کپی کردن این آجر خطایی رخ داده است - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - یک باتری پر وارد کن و دوباره امتحان کن. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - یک باتری پر وارد کن و دوباره امتحان کن. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1831,6 +1799,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1846,6 +1823,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1858,6 +1843,9 @@ needs read and write access to it. You can always change permissions through you ويرايش Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-fi/strings.xml b/catroid/src/main/res/values-fi/strings.xml index 3a7df7ea84e..14482f0f7f3 100644 --- a/catroid/src/main/res/values-fi/strings.xml +++ b/catroid/src/main/res/values-fi/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-fr/strings.xml b/catroid/src/main/res/values-fr/strings.xml index f8c816c6bd0..974455bb278 100644 --- a/catroid/src/main/res/values-fr/strings.xml +++ b/catroid/src/main/res/values-fr/strings.xml @@ -104,6 +104,10 @@ Créé avec Détails sur cette app Plus d\'apps sur Google Play + Oups ! Impossible d\'ouvrir la galerie d\'applications Huawei, + réessaye plus tard! + Google Play + Huawei AppGallery Tags NFC @@ -590,17 +594,6 @@ et d\'autres services. Veuillez consulter le lien ci-dessous pour leur formulation précise.\n Conditions d’utilisation et de services - - Conditions d’utilisation et de services de Pocket Code - Vous êtes sur le point d\'utiliser cette application avec le - AR.Drone 2.0 de Parrot. Nous vous rappelons fortement de respecter les conditions d\'utilisation et de service de Parrot et de Catrobat. - Ne plus me le rappeler. - - - Vous êtes sur le point d\'utiliser cette application avec - Parrot Saut Sumo. Nous vous rappelons fortement de respecter les conditions d\'utilisation de Parrot et de Catrobat, ainsi que les - services. - Bienvenue ! Pour utiliser cette application, veuillez accepter notre @@ -718,8 +711,6 @@ Composant non disponible Malheureusement, ce projet ne fonctionne pas sur votre appareil. Les composants suivants ne sont pas disponibles :\n\n - Un autre appareil est connecté au Saut Sumo. Assurez-vous que vous - êtes celui connecté au drone. \u2022 Vibration\n \u2022 Accéléromètre\n \u2022 Gyroscope\n @@ -729,7 +720,6 @@ \u2022 Caméra arrière\n \u2022 Détection de visage\n \u2022 Détection de texte\n - \u2022 Saut Sumo\n \u2022 Caméra frontale\n \u2022 Caméra\n \u2022 Lampe de poche\n @@ -935,6 +925,7 @@ Écrire les données de la broderie dans le fichier broderie Coudre + Utilise la couleur du fil Reset timer @@ -961,7 +952,7 @@ Lorsqu’il y a collision physique avec n’importe quoi - Quand tu reçois + Quand vous recevez Diffuser Diffuser et attendre Continuer la scène @@ -980,7 +971,7 @@ Lorsque l’écran est touché Créer un clone de moi-même - Quand j’ai commencé comme un clone + Quand vous commencez en tant que clone Supprimer ce clone Affirmer équivaut à attendu @@ -1202,18 +1193,7 @@ Téléchargement en cours Téléchargement terminé "Ouvrir " - Attention. La batterie est faible. Le statut actuel est %d Taille : - La batterie est faible (atterrissage automatique). - Une ou plusieurs caméras ne répondent pas. - Le capteur d\'ultrasons ne répond pas. - Les angles AR.Drone 2.0 Euler sont allés trop haut. Les moteurs s\'arrêtent pour éviter un comportement - dangereux. - Un ou plusieurs moteurs ont été arrêtés par l’environnement. - La batterie est trop faible pour décoller à nouveau. - Le capteur à ultrasons ne peut pas déterminer l\'altitude AR.Drone 2.0. - Aucune estimation de la vitesse de la caméra inférieure avant. - Urgence Cette application a besoin des autorisations demandées pour fonctionner correctement. Par exemple, la brique @@ -1239,18 +1219,6 @@ doit avoir accès en lecture et en écriture à la mémoire locale. Vous pouvez modifier quelque chose et réessayer. Une erreur est apparue en ajoutant ce bloc Une erreur est apparue en copiant ce bloc - ARDrone 2.0 est introuvable. - Connectez votre wifi à l\'ARDrone 2.0 et réessayez. - Batterie de l\'AR.Drone 2.0 faible : %d%%. - Insérez une batterie et essayez à nouveau. - Nous ne pouvons pas exécuter un projet Jumping Sumo sur votre appareil. - Sumo de Saut introuvable - Connectez votre wifi au Jumping Sumo et réessayez. - Sauter la batterie Sumo faible - Insérez une batterie et essayez à nouveau. - Pas de support de Sumo Saut - Pas de support AR.Drone 2.0. - Nous ne pouvons pas exécuter un projet AR.Drone 2.0 sur votre appareil. Renommer un projet incompatible n\'est pas possible. Une erreur s\'est produite lors du partage du fichier de broderie. Une erreur s\'est produite lors de l\'écriture du fichier de broderie. @@ -1864,6 +1832,15 @@ doit avoir accès en lecture et en écriture à la mémoire locale. Vous pouvez à nouveau ! Afficher le programme + + Le projet que tu essaye de télécharger existe déjà sur + la plateforme communautaire sous exactement le même nom. Change ton projet, idéalement en + l\'améliorant, avant de télécharger ton projet remixé. + Envisage d\'ajouter quelques mots aimables à l\'auteur + original dans la section Crédits sur le site communautaire ou dans les options du projet. Note que + l\'auteur original va recevoir une notification après ton téléversement réussi. + Pour savoir plus au sujet des remixes, visite %1s. + J\'ai compris Permettre d’afficher les indices @@ -1879,6 +1856,13 @@ doit avoir accès en lecture et en écriture à la mémoire locale. Vous pouvez Votre programme est composé de différents acteurs et objets qui peuvent interagir entre eux. Pour ajouter un nouvel acteur ou un nouvel objet, appuyez sur le symbole \"+\". + + Montrer des explications ? + Les explications te donnes des informations utiles + lors de la réalisation de ton premier projet.\n\nLa visibilité des explications peut être modifiée dans les préférences. + CACHER + AFFICHER + @@ -1891,6 +1875,8 @@ doit avoir accès en lecture et en écriture à la mémoire locale. Vous pouvez Éditer Valeur Récemment utilisé + Placer visuellement + On te demandera de placer le nouvel acteur ou objet sur l\'écran. Aucune variable sélectionnée diff --git a/catroid/src/main/res/values-gl/strings.xml b/catroid/src/main/res/values-gl/strings.xml index bf6468d4707..15419c1bf43 100644 --- a/catroid/src/main/res/values-gl/strings.xml +++ b/catroid/src/main/res/values-gl/strings.xml @@ -104,6 +104,10 @@ Creado con Detalles sobre esta aplicación Máis aplicacións en Google Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Condicións de uso e servizo - - Condicións de uso e servizo - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Tamaño: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Editar Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-gu/strings.xml b/catroid/src/main/res/values-gu/strings.xml index 293856b46d4..fe87a5cd728 100644 --- a/catroid/src/main/res/values-gu/strings.xml +++ b/catroid/src/main/res/values-gu/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ha/strings.xml b/catroid/src/main/res/values-ha/strings.xml index 765ee84c7f8..15df53ffbed 100644 --- a/catroid/src/main/res/values-ha/strings.xml +++ b/catroid/src/main/res/values-ha/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-hi/strings.xml b/catroid/src/main/res/values-hi/strings.xml index 811525f7617..0efb0e98781 100644 --- a/catroid/src/main/res/values-hi/strings.xml +++ b/catroid/src/main/res/values-hi/strings.xml @@ -106,6 +106,10 @@ ने बनाया इस एप्लिकेशन के बारे में विवरण गूगल प्ले पर अधिक ऐप्स + वूप्स! Huawei AppGallery खोलने में विफल, + कृपया बाद में पुन: प्रयास करें। + गूगल प्ले + हुआवेई ऐप गैलरी एनएफसी टैग @@ -595,17 +599,6 @@ और अन्य सेवाएं। कृपया उनके सटीक निरूपण के लिए नीचे दिया गया लिंक देखें। \n उपयोग और सेवाओं की शर्तें - - उपयोग और सेवाओं की शर्तें - आप इस ऐप का उपयोग तोते के साथ मिलकर करने वाले हैं - AR.Drone 2.0। हम आपको तोता और कैटोबोट दोनों के उपयोग और सेवाओं की शर्तों का पालन करने के लिए दृढ़ता से याद दिलाते हैं। - मुझे फिर से याद न दिलाएं - - - आप इस ऐप को एक साथ उपयोग करने वाले हैं - तोते का उछलना सूमो। हम आपको तोता और कैटोबोट के उपयोग की शर्तों और दोनों का पालन करने के लिए दृढ़ता से याद दिलाते हैं - सेवाएँ - स्वागत हे! इस एप्लिकेशन का उपयोग करने के लिए, कृपया हमारे स्वीकार करें @@ -722,7 +715,6 @@ घटक उपलब्ध नहीं है दुर्भाग्य से यह प्रोजेक्ट आपके डिवाइस पर काम नहीं करता है। निम्नलिखित घटक अनुपलब्ध हैं: \n\n - एक अन्य उपकरण सूमो से जुड़ा है । ध्यान रखे, आप अकेले ही गबन के लिए ही नियंत्रक रहे। \u2022 कंपन \n \u2022 त्वरण संवेदक\n \u2022 त्वरण संवेदक\n @@ -732,7 +724,6 @@ \u2022 रियर कैमरा\n \u2022 चेहरा पहचान \n \u2022 पाठ पहचान\n - \u2022 जंपिंग सूमो\n \u2022 फ्रंट कैमरा\n \u2022 कैमरा \n \u2022 टॉर्च \n @@ -938,6 +929,7 @@ फ़ाइल करने के लिए कढ़ाई डेटा लिखें कढ़ाई सीना + थ्रेड कलर को सेट करें टाइमर को रीसेट करें @@ -1206,18 +1198,7 @@ डाउनलोड जारी है सफल डाउनलोड करें "खुला हुआ" - ध्यान। बैटरी कम है। वर्तमान स्थिति %d है आकार: - बैटरी कम है (स्वचालित लैंडिंग)। - एक या अधिक कैमरे जवाब नहीं दे रहे हैं। - अल्ट्रासाउंड सेंसर जवाब नहीं दे रहा है। - AR.Drone 2.0 यूलर कोण बहुत अधिक चला गया। खतरनाक को रोकने के लिए मोटर्स बंद हो गए - व्यवहार। - एक या अधिक मोटरों को पर्यावरण द्वारा रोक दिया गया था। - फिर से उतारने के लिए बैटरी बहुत कम है। - अल्ट्रासाउंड सेंसर AR.Drone 2.0 ऊंचाई निर्धारित नहीं कर सकता है। - नीचे की ओर कैमरे से गति का अनुमान नहीं। - आपातकालीन इस एप्लिकेशन को ठीक से काम करने के लिए अनुरोधित अनुमतियों की आवश्यकता है। जैसे, द @@ -1243,18 +1224,6 @@ कुछ बदलें और पुनः प्रयास करें। इस ईंट को जोड़ते समय कुछ गड़बड़ हो गई। इस ईंट की नकल करते समय कुछ गड़बड़ हुई। - AR.Drone 2.0 नहीं मिल सकता है। - अपने वाईफाई को AR.Drone 2.0 से कनेक्ट करें और फिर से प्रयास करें। - AR.Drone 2.0 बैटरी कम: %d%% - अपने बंधन को AR.Drone 2.0 से कनेक्ट करें और फिर से प्रयास करें। - हम आपके डिवाइस पर जंपिंग सूमो प्रोजेक्ट नहीं चला सकते हैं। - जंपिंग सूमो नहीं मिल सकता - जंपिंग सूमो में अपने वाईफाई को कनेक्ट करें और फिर से प्रयास करें। - जंपिंग सूमो बैटरी कम - अपने बंधन को AR.Drone 2.0 से कनेक्ट करें और फिर से प्रयास करें। - नो जंपिंग सूमो सपोर्ट - कोई AR.Drone 2.0 समर्थन नहीं करता है। - हम आपके डिवाइस पर AR.Drone 2.0 प्रोजेक्ट नहीं चला सकते हैं। असंगत परियोजना का नाम बदलना संभव नहीं है। कढ़ाई फ़ाइल साझा करते समय कुछ गलत हो गया। कढ़ाई फ़ाइल लिखते समय कुछ गलत हो गया। @@ -1874,6 +1843,15 @@ फिर व! प्रोजेक्ट दिखाएं + + जिस प्रोजेक्ट को आप अपलोड करने का प्रयास कर रहे हैं, वह पहले से मौजूद है + बिल्कुल उसी रूप में सामुदायिक मंच। आदर्श रूप से, कृपया अपना प्रोजेक्ट बदलें + अपनी रीमिक्स की गई परियोजना को अपलोड करने से पहले इसे बढ़ाएं। + कृपया मूल की ओर कुछ प्रकार के शब्द जोड़ने पर विचार करें + लेखक सामुदायिक साइट पर या परियोजना विकल्पों में क्रेडिट अनुभाग में। कृपया ध्यान दें + आपके सफल अपलोड के बाद उपयोगकर्ता को एक सूचना मिलेगी। + रीमिक्स के बारे में अधिक जानने के लिए, कृपया %1s पर जाएं। + समझ गया संकेत दिखाने के लिए सक्षम करें @@ -1889,6 +1867,14 @@ आपके कार्यक्रम में विभिन्न अभिनेता और ऑब्जेक्ट होते हैं जो एक दूसरे के साथ बातचीत कर सकते हैं। एक नया अभिनेता या ऑब्जेक्ट जोड़ने के लिए, \"+\" प्रतीक टैप करें। + + संकेत दिखाओ? + संकेत आपको उपयोगी जानकारी प्रदान करते हैं + अपना पहला प्रोजेक्ट बनाते समय। \n\n संकेतों की विश्वसनीयता को बदला जा सकता है + समायोजन। + छिपाना + छिपाना + @@ -1901,6 +1887,9 @@ बदलें मूल्य हाल ही में उपयोग किया गया + नेत्रहीन जगह + आपको नए अभिनेता या ऑब्जेक्ट को रखने के लिए कहा जाएगा + मंच। कोई चर नहीं चुना गया diff --git a/catroid/src/main/res/values-hr/strings.xml b/catroid/src/main/res/values-hr/strings.xml index 653f947f92a..d3e59bd77e7 100644 --- a/catroid/src/main/res/values-hr/strings.xml +++ b/catroid/src/main/res/values-hr/strings.xml @@ -104,6 +104,10 @@ Kreirano sa Detalji o ovoj aplikaciji Vise aplikacija u trgovini aplikacijama + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -626,17 +630,6 @@ and other services. Please see the link below for their precise formulation.\n Uvjeti koristenja i usluga - - Uvjeti koristenja i usluga - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Ne podsjećaj me više. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Dobrodošli! To use this app, please accept our @@ -754,8 +747,6 @@ Komponenta nije dostupna Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -765,7 +756,6 @@ \u2022 Zadnja kamera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Prednja kamera\n \u2022 Camera\n \u2022 Flashlight\n @@ -973,6 +963,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1246,18 +1237,7 @@ Preuzimanje u tijeku Uspješno preuzimanje "Otvori " - Pozor. Baterija slaba. Trenutno stanje je %d Veličina: - Baterija slaba (automatsko slijetanje). - Jedna ili vise kamera ne reagira. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Baterija je preslaba za ponovno polijetanje. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Hitno This app needs the requested permissions to function properly. E.g., the @@ -1282,18 +1262,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Pogreška pri dodavanju bloka Došlo je do pogreške tijekom kopiranja ovog bloka - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Umetnite napunjenu bateriju i pokušajte ponovno. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Umetnite napunjenu bateriju i pokušajte ponovno. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1913,6 +1881,15 @@ needs read and write access to it. You can always change permissions through you again! Prikazi projekt + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Shvaćam Enable to show hints @@ -1928,6 +1905,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1940,6 +1925,9 @@ needs read and write access to it. You can always change permissions through you Uredi Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-hu/strings.xml b/catroid/src/main/res/values-hu/strings.xml index 85dc81332c5..3d0cc8b04fb 100644 --- a/catroid/src/main/res/values-hu/strings.xml +++ b/catroid/src/main/res/values-hu/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Letöltés folyamatban Letöltés sikeres "Megnyitás " - Attention. Battery is low. Current status is %d Méret: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Hiba történt az elem hozzáadása során Hiba történt az elem másolása során - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Helyezz be egy feltöltött akkumulátort, majd próbáld újra. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Helyezz be egy feltöltött akkumulátort, majd próbáld újra. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Szerkesztés Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ig/strings.xml b/catroid/src/main/res/values-ig/strings.xml index 1a410f82e4e..be1883a54d5 100644 --- a/catroid/src/main/res/values-ig/strings.xml +++ b/catroid/src/main/res/values-ig/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -557,17 +561,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -685,8 +678,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -696,7 +687,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -900,6 +890,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1163,18 +1154,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1200,18 +1180,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1831,6 +1799,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1846,6 +1823,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1858,6 +1843,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-in/strings.xml b/catroid/src/main/res/values-in/strings.xml index 2ed5961b108..1345e55479a 100644 --- a/catroid/src/main/res/values-in/strings.xml +++ b/catroid/src/main/res/values-in/strings.xml @@ -31,7 +31,7 @@ Baru… edit… Konfirmasi - Ignore + Mengabaikan Batalkan Simpan Singkirkan @@ -39,16 +39,16 @@ Oke Selesai Tutup - Assistant + Asisten Ya Tidak - Once - Always - Deny - Accept - Decline - Select all - Deselect all + Sekali + Selalu + Menyangkal + Menerima + Menurun + Pilih Semua + Hapus semua lewati Peringatan Kesalahan @@ -58,24 +58,24 @@ Tambahkan ke ransel share.catrob.at - The project you have downloaded listens to your voice - in the background and also sends data to the internet. This may be harmless, and necessary - for its intended behavior. However, please make sure that what you are saying while the - project is running is safe. In case of doubt, please delete the downloaded project. - You may also report the project on its page on the Catrobat community platform in case - you are sure that it is harmful. + Proyek yang telah Anda unduh mendengarkan suara Anda + di latar belakang dan juga mengirimkan data ke internet. Ini mungkin tidak berbahaya, dan perlu + untuk perilakunya yang dimaksudkan. Namun, harap pastikan bahwa apa yang Anda katakan saat + proyek berjalan aman. Jika ragu, harap hapus proyek yang diunduh. + Anda juga dapat melaporkan proyek pada halamannya di platform komunitas Catrobat jika + Anda yakin itu berbahaya. - Upload without change - Upload with keys replaced - The project contains bricks that access the - web, and also seems to contain API keys. Please see %1s why - uploading these keys can be dangerous. - insert API key here + Unggah tanpa perubahan + Unggah dengan kunci diganti + Proyek ini berisi batu bata yang mengakses + web, dan juga tampaknya berisi kunci API. Silakan lihat %1s mengapa + mengunggah kunci ini bisa berbahaya. + masukkan kunci API di sini - Checking login data… - Exchanging Google login data… - Google login on our server is complete… + Memeriksa data login… + Bertukar data login Google… + Login Google di server kami selesai… Berhasil keluar derajat Latar belakang @@ -85,11 +85,11 @@ Memutuskan - Continue project - New project + Lanjutkan proyek + Proyek baru Program Bantuan - Catrobat community + Komunitas Catrobat Mengunggah Program Nilai kami! Syarat Penggunaan dan Layanan @@ -98,54 +98,58 @@ Masuk Logout Konverter Scratch - App store not found + App store tidak ditemukan Dibuat dengan Rincian tentang aplikasi ini Aplikasi lainnya di Google Play + Ups! Gagal membuka Huawei AppGallery, + silahkan coba lagi nanti. + Google Play + Galeri Aplikasi Huawei - NFC tags + Tag NFC Pengaturan Bahasa - Set the app\'s language - Web access - Edit to add or remove trusted domains - Edit trusted domains - Accessibility - Change the app\'s appearance - Accessibility profiles - Predefined profiles - Profiles - Predefined profiles - Pick a predefined accessibility profile - Text appearance - Handling - Large icons - Increase icon size. - High contrast icons - Icons - Show icons - Add icons to categories and bricks. - High contrast - Increase the text contrast. - Increase the text size. - Large text - Large element spacing - Increase element spacing in lists. - Drag\'n\'drop delay - Drag\'n\'drop delay for bricks. - Beginner mode - Show only simple features. - Choose a text type - Regular + Setel bahasa aplikasi + akses web + Edit untuk menambah atau menghapus domain tepercaya + Edit domain tepercaya + Aksesibilitas + Ubah tampilan aplikasi + Profil aksesibilitas + Profil standar + Profil + Profil standar + Pilih profil aksesibilitas yang telah ditentukan sebelumnya + Penampilan teks + Penanganan + Ikon besar + Tingkatkan ukuran ikon + Ikon kontras tinggi + Ikon + Tampilkan ikon + Tambahkan ikon ke kategori dan batu bata. + Kontras tinggi + Tingkatkan kontras teks. + Tingkatkan ukuran teks. + Teks besar + Jarak elemen yang besar + Tingkatkan spasi elemen dalam daftar. + Penundaan drag\'n\'drop + Penundaan drag\'n\'drop untuk batu bata. + Mode pemula + Tampilkan hanya fitur-fitur sederhana. + Pilih jenis teks + Reguler Serif - Dyslexic - Changes applied + Disleksia + Perubahan diterapkan Default - Default settings - My custom profile + Pengaturan default + Profil kustom saya My personal settings Argus High contrast, additional icons @@ -156,7 +160,7 @@ Large element spacing, drag\'n\'drop delay Tiro - Beginner mode + Mode pemula Parrot AR.Drone 2.0 batu bata Allow the app to control Parrot AR.Drone 2.0 quadcopters @@ -557,17 +561,6 @@ and other services. Please see the link below for their precise formulation.\n Syarat Penggunaan dan Layanan - - Syarat Penggunaan dan Layanan - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Jangan ingatkan saya lagi. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -684,7 +677,6 @@ Komponen tidak tersedia Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Perangkat lain terhubung ke Jumping Sumo. Pastikan, Anda adalah satu-satunya Pengendali untuk Drone. \u2022 Vibration\n \\2022 Sensor akselerasi \n \u2022 Sensor inklinasi \n @@ -694,7 +686,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Lompati Sumo \n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -898,6 +889,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1161,18 +1153,7 @@ Sedang mengunduh Berhasil mengunduh "Buka " - Attention. Battery is low. Current status is %d Ukuran: - Baterai rendah (landing otomatis). - Satu atau lebih kamera tidak merespons. - Sensor ultrasound tidak merespons. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - Satu atau lebih motor dihentikan oleh lingkungan. - Baterai terlalu rendah untuk lepas landas lagi. - Sensor ultrasound tidak dapat menentukan ketinggian AR.Drone 2.0. - Tidak ada perkiraan kecepatan dari kamera menghadap bawah. - Keadaan darurat This app needs the requested permissions to function properly. E.g., the @@ -1198,18 +1179,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Terjadi kesalahan saat menambahkan bata ini Terjadi kesalahan saat menyalin bata ini - Tidak dapat menemukan AR.Drone 2.0. - Hubungkan wifi Anda ke AR.Drone 2.0 dan coba lagi. - AR.Drone 2.0 baterai rendah: %d%% - Masukkan baterai yang penuh dan coba lagi. - Kami tidak dapat menjalankan proyek Jumping Sumo di perangkat Anda. - Tidak dapat menemukan Jumping Sumo - Hubungkan wifi Anda ke Jumping Sumo dan coba lagi. - Melompatkan baterai Sumo rendah - Masukkan baterai yang penuh dan coba lagi. - Tidak ada dukungan Jumping Sumo - Tidak ada dukungan AR.Drone 2.0. - Kami tidak dapat menjalankan proyek AR.Drone 2.0 di perangkat Anda. Mengganti nama sebuah proyek yang tidak kompatibel tidak mungkin dilakukan. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1822,6 +1791,15 @@ needs read and write access to it. You can always change permissions through you again! Tampilkan program + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Mengerti Aktifkan untuk menunjukkan petunjuk @@ -1837,6 +1815,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1849,6 +1835,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-it/strings.xml b/catroid/src/main/res/values-it/strings.xml index 3ebeb44b82a..a8ad9137c05 100644 --- a/catroid/src/main/res/values-it/strings.xml +++ b/catroid/src/main/res/values-it/strings.xml @@ -87,10 +87,10 @@ Continua il progetto Nuovo progetto - Programmi + Progetti sul dispositivo Guida Comunità di Catrobat - Carica programma + Carica il progetto Valutaci! Condizioni d\'uso e servizio Informativa sulla privacy @@ -104,6 +104,10 @@ Creato con Dettagli sull\'app Altre app su Google Play + Ops! Errore aprendo Huawei AppGallery, + riprova più tardi. + Google Play + AppGallery di Huawei Tag NFC @@ -197,33 +201,33 @@ Consente di creare test BETA - Oops! Il programma pare essere scomparso + Oops! Il progetto pare essere scomparso o si è perso l\'accesso ad esso. - Oops! Sembrano mancare alcune parti del programma, + Oops! Sembrano mancare alcune parti del progetto, per favore riprova dopo. Oops! Il nostro server non ha risposto in un tempo ragionevole, si prega di riprovare più tardi. - Oops! E\' fallita la conversione del programma Scratch, + Oops! E\' fallita la conversione il progetto Scratch, riprova più tardi! Oops! La conversione di \"%1$s\" è fallita, riprova più tardi! La versione di Pocket Code che utilizzi è obsoleta. Il convertitore Scratch funziona solo sulla versione più recente. Aggiorna il programma su Google Play - Non posso aprire il programma Scratch. Può darsi che + Non posso aprire il progretto Scratch. Può darsi che tu abbia fermato la conversione/download o che tu abbia rinominato/cancellato il programma! - Al momento non è possibile aprire il programma. + Al momento non è possibile aprire il progretto. Attendi fino a quando non viene scaricato completamente. - Non è ancora possibile aprire il programma. + Non è ancora possibile aprire il progetto. Prima scaricalo, poi potrai aprirlo. Non è possibile convertire %1$s. Saembra che sia - un vecchio programma Scratch prima di %2$s; provare un altro. + un vecchio progetto Scratch prima di %2$s; provare un altro. - Non puoi convertire più di %d programma alla volta. Attendi che - l\'esecuzione dei programmi termini prima di riprovare. - Non puoi convertire più di %d programmi alla volta. Attendi che - l\'esecuzione dei programmi termini prima di riprovare. + Non puoi convertire più di %d progetto allo stesso tempo. Per favore attendi che le + conversioni in esecuzione finiscano prima. + Non puoi convertire più di %d progetti allo stesso tempo. Per favore attendi che le + conversioni in esecuzione finiscano prima. - Impossibile aprire il programma perché non è stato + Impossibile aprire il progetto perché non è stato convertito correttamente. Prova a convertirlo nuovamente. Non è stato trovato nulla; riprovare più tardi. Connessione al server interrotta. @@ -231,10 +235,10 @@ Sembra esserci un problema con la connessione al servizio, contatta il team di Catrobat! - Aggiunto %d programma Scratch alla coda… - Aggiunti %d programmi Scratch alla coda… + Aggiunto %d progetto Scratch alla coda… + Aggiunti %d progetti Scratch alla coda… - Iniziata la conversione del programma Scratch… + Iniziata la conversione il progetto Scratch… Converti Convesione in corso… Programmato @@ -254,9 +258,9 @@ Download terminato! Download annullato! In corso - Programmi convertiti + Progetti convertiti per %1$s - ATTENZIONE:\nQuesto programma pare essere privato. Puoi provare + ATTENZIONE:\nQuesto progetto pare essere privato. Puoi provare a convertirlo ma potrebbe non funzionare. Istruzioni Note e crediti @@ -284,8 +288,8 @@ %d giorno %d giorni - Scarica nuovamente il programma - Converti nuovamente il programma + Scarica nuovamente il progetto + Converti nuovamente il progetto @@ -354,7 +358,7 @@ Elimina questi script? - Nome del programma + Nome del progetto Nome della scena Nome dell\'oggetto Nome del gruppo @@ -377,7 +381,7 @@ Durata: %s, dimensione: %s - Rinomina il programma + Rinomina il progetto Rinomina la scena Rinomina oggetto Rinomina aspetto @@ -485,7 +489,7 @@ - Programmi + Progetti Ultimo accesso: Dimensione: Descrizione: @@ -594,16 +598,6 @@ e gli altri programmi eseguibili. Segui il link sottostante per conoscerne i dettagli.\n Condizioni d\'uso e servizio - - Termini d\'uso e servizi di Pocket Code - Si sta per utilizzare questa app insieme a - AR.Drone 2.0 della Parrot. Ti ricordiamo che sei tenuto a rispettare le Condizioni d\'uso e dei servizi sia di Parrot che di Catrobat. - Non ricordarmelo più. - - - Si sta per utilizzare questa app insieme a Jumping Sumo - della Parrot. Ti ricordiamo che sei tenuto a rispettare le Condizioni d\'uso e dei servizi sia di Parrot che di Catrobat. - Benvenuto! Per utilizzare questa app, si prega di accettare @@ -623,7 +617,7 @@ Nessuna Rete - Carica programma + Carica progetto Descrizione: Note e crediti: Come hai creato questo progetto? Hai usato idee, script o lavori altrui? Ringraziali qui. @@ -708,9 +702,9 @@ Il progetto esiste già. - Esiste già un programma con questo nome. Scegli un nome diverso! - Sostituisci il programma - Rinominare il programma scaricato + Esiste già un progetto con questo nome. Scegli un nome diverso! + Sostituisci il progetto + Scegliere un nuovo nome Canzone senza titolo @@ -719,10 +713,8 @@ Motore di sintesi vocale non installato! \nVuoi installarlo? Componente non disponibile - Questo programma non funziona sul tuo dispositivo. + Questo progetto non funziona sul tuo dispositivo. Non sono disponibili i seguenti componenti:\n\n - Un altro dispositivo è connesso al Jumping Sumo. Assicurati - di essere il solo a controllare il drone. \u2022 Vibrazione\n \u2022 Sensore di Accelerazione\n \u2022 Sensore di Inclinazione\n @@ -732,7 +724,6 @@ \u2022 Videocamera posteriore\n \u2022 Rileva volto\n \u2022 Rileva testo\n - \u2022 Jumping Sumo\n \u2022 Videocamera anteriore\n \u2022 Fotocamera\n \u2022 Torcia\n @@ -938,13 +929,14 @@ Scrivi i dati del ricamo su file ricamo.dst Cucire + Imposta il colore della conversazione a Reimposta timer Apri  Nel browser - Quando il programma inizia + Quando la scena inizia Quando premuto Quando diventa vero @@ -1158,7 +1150,7 @@ Cinguettio1 Cinguettio2 direzione - Il mio primo programma di trasmissione + Il mio primo progetto Chromecast Testo X: @@ -1193,31 +1185,20 @@ Anteprima immagine salvata - Download del programma annullato - Annullato il download/conversione del programma + Download del progetto annullato + Annullato il download/conversione del progetto "Caricamento " "Notifica da " Caricamento in corso Caricamento terminato con successo - L\'invio del programma è stato rifiutato + L\'invio del progetto è stato rifiutato Riprova Apri Play Store "Download di " Download in corso Download completato "Apri " - Attenzione. Batteria quasi scarica. Lo stato corrente è %d Dimensione: - Batteria scarica (atterraggio automatico). - Una o più fotocamere non rispondono. - Il sensore a ultrasuoni non risponde. - Angoli euleriani del AR.Drone 2.0 troppo elevati. I motori sono stati spenti per prevenire - comportamenti pericolosi. - Uno o più motori sono stati interrotti da qualcosa nell\'ambiente. - Batteria troppo scarica per un nuovo decollo. - Il sensore a ultrasuoni non può determinare l\'altitudine del AR.Drone 2.0. - Nessuna stima di velocità dalla fotocamera rivolta in basso. - Emergenza Questa app necessità delle autorizzazioni richieste per funzionare correttamente. Per esempio @@ -1225,14 +1206,14 @@ il mattoncino della videocamera necessita di accedere alla videocamera del dispo la posizione del sensore di posizione, per importare o esportare progetti sulla memoria secondaria, l\'app deve poter accedere sia in lettura che in scrittura ad essa. Puoi sempre modificare i permessi in un secondo momento dalle impostazioni del dispositivo. - Errore durante il caricamento del programma. - Errore durante il download del programma. + Errore durante il caricamento del progetto. + Errore durante il download del progetto. "Il progetto %s è già in coda." "Il download non può essere avviato, sembra che ci sia un problema con il nostro server." - Errore durante la creazione di un nuovo programma. + Errore durante la creazione di un nuovo progetto. Errore durante il cambiamento di nome della scena. - Errore durante il caricamento del programma. + Errore durante il caricamento del progetto. Errore durante il salvataggio dell\'anteprima dell\'immagine. Si è verificato un errore non conosciuto. Controllare la connessione a Internet. Il progetto non è compatibile con questa versione dell\'app. @@ -1243,18 +1224,6 @@ deve poter accedere sia in lettura che in scrittura ad essa. Puoi sempre modific cambia qualcosa e riprova. Si è verificato un errore durante l\'aggiunta di questo Mattoncino Si è verificato un errore durante la copia di questo Mattoncino - Impossibile trovare AR.Drone 2.0. - Connettiti al tuo AR.Drone 2.0 via wifi e riprova. - Batteria del AR.Drone 2.0 bassa: %d%% - Inserisci una batteria carica e riprova. - Impossibile eseguire un progetto Jumping Sumo sul tuo dispositivo. - Nessun Jumping Sumo trovato - Connettiti al wifi del Jumping Sumo e riprova. - Batteria bassa del Jumping Sumo - Inserisci una batteria carica e riprova. - Nessun supporto a Jumping Sumo - Non c\'è supporto ad AR.Drone 2.0. - Impossibile eseguire il progetto AR.Drone 2.0 sul tuo dispositivo. Non è possibile rinominare un progetto non compatibile. Qualcosa è andato storto durante la condivisione del file. C\'è stato un errore durante la condivisione del file. @@ -1265,7 +1234,7 @@ deve poter accedere sia in lettura che in scrittura ad essa. Puoi sempre modific Qualcosa è andato storto durante il salvataggio delle nuove note e crediti. WhatsApp non è installato - Questo script non può essere aggiunto ad un programma + Questo script non può essere aggiunto ad un progetto per Chromecast. @@ -1331,9 +1300,9 @@ deve poter accedere sia in lettura che in scrittura ad essa. Puoi sempre modific Sensore non trovato! Configurazione sensore NXT Disattiva finestra di dialogo - Le impostazioni specifiche per l\'NXT non vengono mostrare quando si apre un programma. - La mappatura dei sensori NXT alle porte è specifico per ogni programma e può essere configurata solo per i programmi aperti! - Il programma attuale utilizza mattoncini Lego Mindstorms NXT o i suoi sensori. Per il corretto funzionamento si prega di collegare i sensori al robot come segue + Le impostazioni specifiche per l\'NXT non vengono mostrare quando si apre un progetto. + La mappatura dei sensori NXT alle porte è specifico per ogni progetto e può essere configurata solo per i progetti aperti! + Il progetto attuale utilizza mattoncini Lego Mindstorms NXT o i suoi sensori. Per il corretto funzionamento si prega di collegare i sensori al robot come segue Porta 1 Porta 2 Porta 3 @@ -1342,8 +1311,8 @@ deve poter accedere sia in lettura che in scrittura ad essa. Puoi sempre modific Scegli una porta per la connessione a %1$s! Configurazione sensore EV3 Le impostazioni specifiche per EV3 non vengono mostrare quando si apre un programma. - La mappatura dei sensori EV3 alle porte è specifico per ogni programma e può essere configurata solo per i programmi aperti! - Il programma attuale utilizza mattoncini Lego Mindstorms EV3 o i suoi sensori. Per il corretto funzionamento si prega di collegare i sensori al robot come segue + La mappatura dei sensori EV3 alle porte è specifico per ogni programma e può essere configurata solo per i progetto aperti! + Il progetto attuale utilizza mattoncini Lego Mindstorms EV3 o i suoi sensori. Per il corretto funzionamento si prega di collegare i sensori al robot come segue Sensore collegato alla porta 1 Sensore collegato alla porta 2 Sensore collegato alla porta 3 @@ -1803,7 +1772,7 @@ con tolleranza % In \"Dispositivo\" puoi trovare informazioni che il tablet o lo smartphone registra.\nPer esempio, l\'inclinazione del dispositivo o il rumore di fondo. Dati - Variabili e liste usate nel tuo programma possono essere trovate qui..\nPuoi inserirle in qualsiasi tua formula o crearne di nuove. + Variabili e liste usate nel tuo progetto possono essere trovate qui..\nPuoi inserirle in qualsiasi tua formula o crearne di nuove. lingua di ascolto Riconoscimento vocale Si è verificato un problema con il rilevamento del testo. Alcuni componenti potrebbero essere ancora in fase di download @@ -1859,13 +1828,22 @@ con tolleranza % Eliminare una variabile o lista ancora in uso può portare a degli errori. Operazione non ripristinabile! - Il programma viene caricato sulla pagina della community dove gli altri lo possono usare + Il progetto viene caricato sulla pagina della community dove gli altri lo possono usare e scaricare. Puoi anche scaricare l\'app come applicazione standalone per android. Upload fallito. Verifica la tua connessione a internet e riprova! - Mostra il programma - + Mostra il progetto + + + Il progetto che stai cercando di caricare esiste già sulla + piattaforma esattamente uguale. Cambia il tuo progetto, idealmente + migliorandolo, prima di caricare il tuo progetto remixato. + Considera il fatto di poter aggiungere alcuni ringraziamenti all\'autore + originale nella sezione Crediti sul sito della community o nelle opzioni del progetto. + L\'utente riceverà una notifica dopo il completamento del caricament. + Per saperne di più sui remix, visita %1s. + Va bene Abilita suggerimenti @@ -1880,6 +1858,13 @@ con tolleranza % Il tuo programma consiste in diversi attori ed oggetti che possono interagire fra loro. Per aggiungere un nuovo attore o oggetto, tocca il simbolo \"+\". + + Mostra suggerimenti? + I suggerimenti ti forniscono utili informazioni + durante la realizzazione del tuo primo progetto.\n\nLa visibilità dei suggerimenti può essere modificata nelle impostazioni. + NASCONDI + MOSTRA + @@ -1892,6 +1877,9 @@ con tolleranza % Modifica Valore Usato di recente + Posiziona visivamente + Ti verrà chiesto di posizionare il nuovo personaggio o oggetto sulla scena +. Nessuna variabile selezionata diff --git a/catroid/src/main/res/values-iw/strings.xml b/catroid/src/main/res/values-iw/strings.xml index bc82e36cece..fb5034f6a4c 100644 --- a/catroid/src/main/res/values-iw/strings.xml +++ b/catroid/src/main/res/values-iw/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google play + Huawei App Gallery NFC tags @@ -671,17 +675,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -799,8 +792,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -810,7 +801,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -1020,6 +1010,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1298,18 +1289,7 @@ הורדה מתבצעת הורדה הושלמה "פתח " - Attention. Battery is low. Current status is %d גודל: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1335,18 +1315,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. אירעה שגיאה בעת הוספת לבנה זו אירעה שגיאה בעת העתקת הלבנה - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1966,6 +1934,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1981,6 +1958,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1993,6 +1978,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ja/strings.xml b/catroid/src/main/res/values-ja/strings.xml index 7b83ac6b95d..8131dedf890 100644 --- a/catroid/src/main/res/values-ja/strings.xml +++ b/catroid/src/main/res/values-ja/strings.xml @@ -104,6 +104,10 @@ 作成 このアプリの詳細について Google Play でより多くのアプリ + おっと！？Huawei AppGalleryを開くのに失敗しました。 + 後でもう一度お試しください。 + Google Play + Huawei App Gallery NFC タグ @@ -553,17 +557,6 @@ 遵守していただく必要があります。具体的には以下のリンクを参照してください。 利用とサービスの規約 - - ポケットコード利用とサービスの規約 - Parrot の - AR.Drone 2.0 と一緒にこのアプリを使用しようとしています。 オウムとCatrobatの利用規約とサービスの両方を遵守することを強くお知らせします。 - 今後表示しない。 - - - このアプリと一緒に使おうとしているのは - Parrot\'s Jumping Sumo」です。オウムのジャンピング相撲」のご利用にあたっては、「オウムのジャンピング相撲」と「Catrobatのジャンピング相撲」の両方の利用規約とサービス内容を遵守していただくようお願いいたします。 - サービスを提供しています。 - ようこそ！ このアプリを使用するには、次のことを承認してください @@ -680,8 +673,6 @@ コンポーネントは使用できません 申し訳ありませんが、このプロジェクトはお使いのデバイスでは動作しません。 次のコンポーネントは使用できません:\n\n - ジャンプ相撲に別のデバイスが接続されています。 - がドローンに接続されていることを確認してください。 \u2022 バイブレーション\n \u2022 加速度センサー\n \u2022 傾斜センサー\n @@ -691,7 +682,6 @@ \u2022 背面カメラ\n \u2022 顔検出\n \u2022 テキスト検出\n - \u2022 ジャンプ相撲\n \u2022 フロントカメラ\n \u2022 カメラ\n \u2022 懐中電灯\n @@ -895,6 +885,7 @@ 刺繍データをファイルに書く 刺繍.dst 縫製する + 糸の色を リセットタイマー @@ -1157,18 +1148,7 @@ ダウンロードが進行中 ダウンロードに成功しました "開く " - 注意。バッテリー残量が少なくなっています。現在の状態は %d です プログラムのサイズ： - バッテリー残量が少なくなりました (自動着陸)。 - 1 つまたは複数のカメラが応答していません。 - 超音波センサーが応答していません。 - AR.Drone 2.0 オイラーの角度が高すぎました。モーターはシャットダウンして危険な - 動作を防ぎます。 - 1 つまたは複数のモーターが環境によって停止されました。 - バッテリー残量が少なすぎるため再び離陸できません。 - 超音波センサーではAR.Drone 2.0の高度がわからない。 - 下向きのカメラから速度を推定できません。 - 緊急 このアプリは、正常に機能するために要求された許可が必要です。例えば、以下のようなものがあります。 @@ -1194,18 +1174,6 @@ 何かを変更して再度お試し下さい。 このブロックを追加中にエラーが発生しました このブロックをコピー中にエラーが発生しました - AR.Drone 2.0が見つかりません。 - Wi-FiをAR.Drone 2.0に接続し、もう一度やり直してください。 - AR.Drone 2.0 バッテリー残量: %d%% - 充電済みのバッテリーを挿入して、もう一度やり直してください。 - お使いの端末では、ジャンピングスーモのプロジェクトを実行することはできません。 - ジャンプ相撲が見つかりません - Wi-Fiをジャンプ相撲に接続し、もう一度お試しください。 - 相撲のバッテリー残量が少なくなります - 充電済みのバッテリーを挿入して、もう一度やり直してください。 - ジャンプ中の相撲はありません - AR.Drone 2.0には対応していません。 - お使いのデバイスで AR.Drone 2.0 プロジェクトを実行できません。 互換性のないプロジェクトの名前を変更することはできません。 刺繍ファイルの共有中に問題が発生しました。 刺繍ファイルの作成中に問題が発生しました。 @@ -1807,6 +1775,15 @@ をもう一度やり直してください。 プログラムの表示 + + アップロードしようとしているプロジェクトは、すでに + 全く同じ形でコミュニティ・プラットフォームに存在しています。あなたのプロジェクトを変更してください。 + リミックスされたプロジェクトをアップロードする前に、プロジェクトを変更してください。 + コミュニティサイトの「クレジット」セクションやプロジェクトのオプションで、原作者に対する親切な言葉を加えることをご検討ください。 + コミュニティサイトの「クレジット」セクション、またはプロジェクトのオプションで、原作者に対する親切な言葉を加えることをご検討ください。ご注意ください + アップロードが完了すると、ユーザーに通知が届きます。 + リミックスの詳細については、%1sをご覧ください。 + うまくいきました 有効にするとヒントを表示します @@ -1822,6 +1799,14 @@ あなたのプログラムは、お互いに相互作用することができるさまざまなアクターとオブジェクトで構成されています。 新しいアクターやオブジェクトを追加するには、「+」記号をタップします。 + + ヒントは？ + ヒントは、最初のプロジェクトを作るときに役立つ情報を提供します。 + ヒントの表示は、設定で変更できます。 + 設定で変更できます。 + 非表示 + ショー + @@ -1834,6 +1819,9 @@ 編集 値 最近使用したもの + 視覚的に配置 + 新しいアクターやオブジェクトをステージ上に配置していただきます。 + ステージに置いていただきます。 変数が選択されていません diff --git a/catroid/src/main/res/values-ka/strings.xml b/catroid/src/main/res/values-ka/strings.xml index 4aa256e560a..feaaa990c31 100644 --- a/catroid/src/main/res/values-ka/strings.xml +++ b/catroid/src/main/res/values-ka/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play Store + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-kab/strings.xml b/catroid/src/main/res/values-kab/strings.xml index 11e2d0746b9..c519154d671 100644 --- a/catroid/src/main/res/values-kab/strings.xml +++ b/catroid/src/main/res/values-kab/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play Store + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-kk/strings.xml b/catroid/src/main/res/values-kk/strings.xml index 9f0e666f1f6..32faf168471 100644 --- a/catroid/src/main/res/values-kk/strings.xml +++ b/catroid/src/main/res/values-kk/strings.xml @@ -104,6 +104,10 @@ Жасалған Бұл қолданба туралы толық ақпарат Басқа бағдарламаларымыз Google Play-де + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -576,17 +580,6 @@ and other services. Please see the link below for their precise formulation.\n Пайдалану және Қызмет Көрсету шарттары - - Пайдалану және Қызмет Көрсету шарттары - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -704,8 +697,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -715,7 +706,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -921,6 +911,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1189,18 +1180,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Өлшем: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1226,18 +1206,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1857,6 +1825,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1872,6 +1849,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1884,6 +1869,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-kn/strings.xml b/catroid/src/main/res/values-kn/strings.xml index 955e4d3fd08..0cb5f9949c6 100644 --- a/catroid/src/main/res/values-kn/strings.xml +++ b/catroid/src/main/res/values-kn/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + ಗೂಗಲ್ ಪ್ಲೇ + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ko/strings.xml b/catroid/src/main/res/values-ko/strings.xml index a093d514d14..fe8c15a9c9e 100644 --- a/catroid/src/main/res/values-ko/strings.xml +++ b/catroid/src/main/res/values-ko/strings.xml @@ -99,6 +99,10 @@ 제작 세부 정보 구글 플레이에서 다른 앱 보기 + 이런! Huawei AppGallery를 열지 못했습니다. + 나중에 다시 시도 해주십시오. + 구글 플레이 + 화웨이 앱 갤러리 NFC 태그 @@ -530,14 +534,6 @@ 포켓 코드와 Catrobat 프로그램에 의해 제공하는 다른 실행 파일을 사용하도록 허용하려면 우리의 이용 약관에 동의하고 포켓 코드와 우리의 다른 실행 파일을 사용할 때 엄격하게 약관을 따라야 합니다. 자세한 세부규정은 아래 링크를 참조하십시오.\n 사용과 서비스 약관 - - 포켓 코드 이용 약관 및 서비스 - 이 앱을 Parrot\'s AR.Drone2.0과 함께 사용해 보십시오. 우리는 당신이 Parrot의 사용 약관과 드론을 위한 서비스, 그리고 Catrobat의 사용 약관을 준수하도록 권고합니다. - 다시 보지 않기 - - - 이 앱을 Parrot\'s AR.Drone2.0과 함께 사용해 보십시오. 우리는 당신이 Parrot의 사용 약관과 드론을 위한 서비스, 그리고 Catrobat의 사용 약관을 준수하도록 권고합니다. - 환영합니다! 앱 사용을 위해, 허용 @@ -650,7 +646,6 @@ 구성 요소 사용할 수 없음 이 프로젝트는 기기에서 작동하지 않습니다. 다음 장치가 사용않됩니다:\n\n - 다른 장치가 점핑 스모와 연결되어 있습니다. 다른 기기가 드론과 연결되어 있는 것은 아닌지 확인하세요. \u2022 진동\n \u2022 가속센서\n \u2022 기울기센서\n @@ -660,7 +655,6 @@ \u2022 뒤 카메라 \n \u2022 얼굴인식\n \u2022 문장인식\n - \u2022 Jumping Sumo\n \u2022 앞 카메라 \n \u2022 카메라 \n \u2022 플래시\n @@ -863,6 +857,7 @@ 파일에 자수 데이터 쓰기 자수 .dst 바느질 + 실 색상을 다음으로 설정 타이머 초기화 @@ -1124,17 +1119,7 @@ 다운로드 진행 중 다운로드 성공 "열기" - 주의. 배터리가 부족합니다. 현재 상태 %d 크기: - 배터리 부족 (자동 종료). - 카메라가 응답하지 않습니다. - 초음파 센서가 응답하지 않습니다. - AR.Drone 2.0 euler의 각도가 너무 높습니다. 잘못 작동되는 것을 피하려면 모터를 정지하세요. - 환경때문에 모터가 정지되었습니다. - 다시 이륙하기에는 배터리가 부족합니다. - 초음파 센서가 AR.Drone 2.0의 고도를 결정하지 못 합니다. - 바닥의 카메라가 속도를 측정할 수 없습니다. - 긴급 이 앱은 기능의 권한이 필요합니다. 즉, 카메라 블록은 기기의 카메라 접근, \"위치\"기능은 기기의 위치 센서의 접근, 프로젝트를 불러오거나 저장하기 위한 일고 저장하는 기능 등. 기기의 설정을 통해 접근 권한을 변경할 수 있습니다. @@ -1154,18 +1139,6 @@ 예시 프로젝트를 그대로 업로드 할 수 없습니다. 수정후 다시 시도 하세요. 이 블록을 추가하는 동안 오류가 발생했습니다. 이 블록을 복사하는 동안 오류가 발생했습니다. - AR.Drone 2.0을 찾을 수 없습니다. - AR.Drone 2.0을 wifi에 연결하고 다시 시도하십시오. - AR.Drone 2.0 배터리 부족: %d%% - 충전된 배터리를 삽입하고 다시 시도하십시오. - 당신의 장치에서는 점핑 스모 프로젝트를 실행시킬 수 없습니다. - Jumping Sumo 찾을 수 없습니다. - 점프 스모의 wifi를 연결하고 다시 시도해 보세요. - Jumping Sumo의 배터리가 부족합니다. - 충전된 배터리를 삽입하고 다시 시도하십시오. - 점핑 스모를 지원하지 않습니다. - AR.Drone 2.0을 지원하지 않습니다. - 이 장치에서 AR.Drone 2.0 프로그램을 실행할 수 없습니다. 호환 되지 않는 프로그램의 이름을 바꿀 수 없습니다. 자수 파일을 공유하는데 문제가 생겼습니다. 패턴 파일을 작성하는 중 문제가 생겼습니다. @@ -1761,6 +1734,15 @@ 업로드 실패. 인터넷 연결상태를 확인하시고 다시 해 주세요! 프로그램 보이기 + + 업로드하려는 프로젝트가 이미 존재합니다. + 완전히 같은 형태의 커뮤니티 플랫폼입니다. 프로젝트를 변경하십시오. + 리믹스 프로젝트를 업로드하기 전에이를 향상시킵니다. + 원문에 친절한 단어를 추가해보세요 + 커뮤니티 사이트의 크레딧 섹션 또는 프로젝트 옵션에서 작성자. 참고 + 업로드 성공 후 사용자에게 알림이 전송됩니다. + 리믹스에 대해 자세히 알아 보려면 %1s를 방문하십시오. + 확인 힌트 표시 사용 @@ -1772,6 +1754,14 @@ 배우나 오브젝트에 새로운 소리를 추가할 수 있어요. 소리 카테고리의 블록을 사용하세요. 서로 작용할 수 있는 오브젝트가 다른 프로그램에 의하여 이루어져 있다. 추가하려면 \"+\"를 터치하세요. + + 힌트를 표시 하시겠습니까? + 힌트는 유용한 정보를 제공합니다. + 첫 번째 프로젝트를 만드는 동안 \n\n 힌트의 가시성은 + 설정. + 숨는 장소 + 보여 주다 + @@ -1784,6 +1774,9 @@ 편집 값 최근 사용 + 보이게 위치 + 새 액터 또는 오브젝트를 + 단계. 선택된 변수가 없습니다. diff --git a/catroid/src/main/res/values-lt/strings.xml b/catroid/src/main/res/values-lt/strings.xml index 137133de3f4..d30278c9515 100644 --- a/catroid/src/main/res/values-lt/strings.xml +++ b/catroid/src/main/res/values-lt/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -671,17 +675,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -799,8 +792,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -810,7 +801,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -1020,6 +1010,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1298,18 +1289,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1335,18 +1315,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1966,6 +1934,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1981,6 +1958,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1993,6 +1978,9 @@ needs read and write access to it. You can always change permissions through you Redaguoti Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-mk/strings.xml b/catroid/src/main/res/values-mk/strings.xml index 3248a47e6e7..e357b1bf96f 100644 --- a/catroid/src/main/res/values-mk/strings.xml +++ b/catroid/src/main/res/values-mk/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ml-rIN/strings.xml b/catroid/src/main/res/values-ml-rIN/strings.xml index 3355a2f95e7..c72b2348c43 100644 --- a/catroid/src/main/res/values-ml-rIN/strings.xml +++ b/catroid/src/main/res/values-ml-rIN/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ms/strings.xml b/catroid/src/main/res/values-ms/strings.xml index ec8e0df860a..a1fdf753819 100644 --- a/catroid/src/main/res/values-ms/strings.xml +++ b/catroid/src/main/res/values-ms/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -557,17 +561,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -685,8 +678,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -696,7 +687,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -900,6 +890,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1163,18 +1154,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1200,18 +1180,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1831,6 +1799,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1846,6 +1823,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1858,6 +1843,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-nl/strings.xml b/catroid/src/main/res/values-nl/strings.xml index bea9204be62..9fc55775e80 100644 --- a/catroid/src/main/res/values-nl/strings.xml +++ b/catroid/src/main/res/values-nl/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Bezig met downloaden Download geslaagd "Open " - Attention. Battery is low. Current status is %d Grootte: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Er is een fout opgetreden bij het toevoegen van dit blok Er is een fout opgetreden tijdens het kopiëren van dit blok - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Plaats een opgeladen accu en probeer het opnieuw. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Plaats een opgeladen accu en probeer het opnieuw. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-no/strings.xml b/catroid/src/main/res/values-no/strings.xml index 5eadf6d8c72..76118b9f0ab 100644 --- a/catroid/src/main/res/values-no/strings.xml +++ b/catroid/src/main/res/values-no/strings.xml @@ -104,6 +104,10 @@ Laget med Detaljer om denne app Flere programmer på Google Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -591,17 +595,6 @@ and other services. Please see the link below for their precise formulation.\n Bruksvilkår og tjenester - - Pocket Code bruksvilkår og tjenester - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Ikke minn meg igjen. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -718,8 +711,6 @@ Komponent ikke tilgjengelig Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 sensor for akselerasjon\n \u2022 Vinkelsensor\n @@ -729,7 +720,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -935,6 +925,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1203,18 +1194,7 @@ Nedlasting pågår Nedlasting vellykket "Åpne " - Attention. Battery is low. Current status is %d Størrelse: - Batterinivået er lavt (automatisk landing). - Én eller flere kamera(er) svarer ikke. - Ultralyd sensoren svarer ikke. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - Én eller flere motor(er) ble stoppet av forholdene. - Batterinivået er for lavt til å ta av igjen. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - Ingen estimering av hastighet fra kamera som peker ned. - Nødsituasjon This app needs the requested permissions to function properly. E.g., the @@ -1240,18 +1220,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Det oppstod en feil når blokken skulle legges til Det oppstod en feil under kopiering av denne blokken - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Sett inn et ladet batteri og prøv på nytt. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Sett inn et ladet batteri og prøv på nytt. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Gi nytt navn til et inkompatibel prosjekt er ikke mulig. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1864,6 +1832,15 @@ needs read and write access to it. You can always change permissions through you again! Vise program + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Skjønner Aktiver for å vise tips @@ -1879,6 +1856,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1891,6 +1876,9 @@ needs read and write access to it. You can always change permissions through you Rediger Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-pa-rIN/strings.xml b/catroid/src/main/res/values-pa-rIN/strings.xml new file mode 100644 index 00000000000..e6b16de8b05 --- /dev/null +++ b/catroid/src/main/res/values-pa-rIN/strings.xml @@ -0,0 +1,1971 @@ + + + + + ਸਟੇਜ + ਖੇਡੋ + ਸੈਟਿੰਗਜ਼ + ਦੁਬਾਰਾ ਕਰੋ + ਵਾਪਿਸ + ਨਵਾਂ… + ਸੰਪਾਦਿਤ ਕਰੋ… + ਪੁਸ਼ਟੀ ਕਰੋ + ਅਣਡਿੱਠ ਕਰੋ + ਰੱਦ ਕਰੋ + ਸੇਵ + ਬਰਖਾਸਤ ਕਰੋ + ਅਗਲਾ + ਠੀਕ ਹੈ + ਹੋ ਗਿਆ + ਬੰਦ ਕਰੋ + ਸਹਾਇਕ + ਹਾਂ + ਨਹੀਂ + ਇਕ ਵਾਰ + ਹਮੇਸ਼ਾ + ਇਨਕਾਰ ਕਰੋ + ਸਵੀਕਾਰ ਕਰੋ + ਅਸਵੀਕਾਰ + ਸਾਰਿਆ ਨੂੰ ਚੁਣੋ + ਸਭ ਦੀ ਚੋਣ ਕਰੋ + ਛੱਡੋ + ਚੇਤਾਵਨੀ + ਗਲਤੀ + ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ… + ਕ੍ਰਿਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ + ਖੋਜ ਕਰੋ… + ਬੈਕਪੈਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ + share.catrob.at + + ਤੁਹਾਡੇ ਦੁਆਰਾ ਡਾedਨਲੋਡ ਕੀਤਾ ਪ੍ਰੋਜੈਕਟ ਤੁਹਾਡੀ ਆਵਾਜ਼ ਸੁਣਦਾ ਹੈ + ਦੀ ਪਿੱਠਭੂਮੀ ਵਿਚ ਹੈ ਅਤੇ ਇਹ ਵੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਡਾਟਾ ਭੇਜਦਾ ਹੈ. ਇਹ ਨੁਕਸਾਨਦੇਹ ਅਤੇ ਜ਼ਰੂਰੀ ਹੋ ਸਕਦਾ ਹੈ + ਇਸ ਦੇ ਇਰਾਦੇ ਵਾਲੇ ਵਿਵਹਾਰ ਲਈ. ਹਾਲਾਂਕਿ, ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਸੁਨਿਸ਼ਚਿਤ ਕਰੋ ਕਿ ਤੁਸੀਂ ਕੀ ਕਹਿ ਰਹੇ ਹੋ + ਪ੍ਰੋਜੈਕਟ ਚੱਲ ਰਿਹਾ ਹੈ ਸੁਰੱਖਿਅਤ ਹੈ. ਸ਼ੱਕ ਦੀ ਸਥਿਤੀ ਵਿੱਚ, ਕਿਰਪਾ ਕਰਕੇ ਡਾedਨਲੋਡ ਕੀਤੇ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਮਿਟਾਓ. + ਤੁਸੀਂ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਇਸਦੇ ਪੇਜ ਤੇ ਕੈਟ੍ਰੋਬੈਟ ਕਮਿ communityਨਿਟੀ ਪਲੇਟਫਾਰਮ ਤੇ ਵੀ ਰਿਪੋਰਟ ਕਰ ਸਕਦੇ ਹੋ + ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ ਕਿ ਇਹ ਨੁਕਸਾਨਦੇਹ ਹੈ. + + ਬਿਨਾਂ ਬਦਲੇ ਅਪਲੋਡ ਕਰੋ + ਕੁੰਜੀਆਂ ਨਾਲ ਅਪਲੋਡ ਕੀਤਾ ਗਿਆ + ਪ੍ਰੋਜੈਕਟ ਵਿੱਚ ਇੱਟਾਂ ਸ਼ਾਮਲ ਹਨ ਜੋ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਦੀਆਂ ਹਨ + ਵੈਬ, ਅਤੇ ਇਸ ਵਿੱਚ ਏਪੀਆਈ ਕੁੰਜੀਆਂ ਵੀ ਲਗਦੀਆਂ ਹਨ. ਕਿਰਪਾ ਕਰਕੇ %1s ਵੇਖੋ + ਇਨ੍ਹਾਂ ਕੁੰਜੀਆਂ ਨੂੰ ਅਪਲੋਡ ਕਰਨਾ ਖ਼ਤਰਨਾਕ ਹੋ ਸਕਦਾ ਹੈ. + ਏਪੀਆਈ ਕੁੰਜੀ ਇੱਥੇ ਪਾਓ + + + ਲੌਗਿਨ ਡਾਟਾ ਦੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ… + ਗੂਗਲ ਲੌਗਇਨ ਡੇਟਾ ਐਕਸਚੇਂਜ ਕਰ ਰਿਹਾ ਹੈ… + ਸਾਡੇ ਸਰਵਰ ਤੇ ਗੂਗਲ ਲੌਗਇਨ ਪੂਰਾ ਹੋ ਗਿਆ ਹੈ… + ਲੌਗਆਉਟ ਸਫਲ + ਡਿਗਰੀ + ਪਿਛੋਕੜ + ਲੈਂਡਸਕੇਪ + ਪੋਰਟਰੇਟ + ਅਣਜਾਣ + ਡਿਸਕਨੈਕਟ + + + ਪ੍ਰੋਜੈਕਟ ਜਾਰੀ ਰੱਖੋ + ਨਵਾਂ ਪ੍ਰੋਜੈਕਟ + ਡਿਵਾਈਸ ਤੇ ਪ੍ਰਾਜੈਕਟ + ਮਦਦ ਕਰੋ + ਕੈਟ੍ਰੋਬੈਟ ਕਮਿ communityਨਿਟੀ + ਪ੍ਰੋਜੈਕਟ ਅਪਲੋਡ ਕਰੋ + ਸਾਨੂੰ ਦਰਜਾ ਦਿਓ! + ਵਰਤੋਂ ਅਤੇ ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ + ਪਰਾਈਵੇਟ ਨੀਤੀ + ਇਸ ਐਪ ਬਾਰੇ + ਲਾਗਿਨ + ਬਾਹਰ ਆਉਣਾ + ਸਕ੍ਰੈਚ ਕਨਵਰਟਰ + ਐਪ ਸਟੋਰ ਨਹੀਂ ਮਿਲਿਆ + + + ਨਾਲ ਬਣਾਇਆ ਗਿਆ + ਇਸ ਐਪ ਬਾਰੇ ਵੇਰਵਾ + ਐਪ ਸਟੋਰ ਤੇ ਹੋਰ ਐਪਸ + ਓਹ! ਹੁਆਵੇਈ ਐਪ ਗੈਲਰੀ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ, + ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ. + ਗੂਗਲ ਪਲੇ ਸਟੋਰ + ਹੁਆਵੇਈ ਐਪ ਗੈਲਰੀ + + ਐਨਐਫਸੀ ਟੈਗਸ + + ਸੈਟਿੰਗਜ਼ + ਭਾਸ਼ਾ + ਐਪ ਦੀ ਭਾਸ਼ਾ ਸੈਟ ਕਰੋ + ਵੈੱਬ ਪਹੁੰਚ + ਭਰੋਸੇਯੋਗ ਡੋਮੇਨ ਜੋੜਨ ਜਾਂ ਹਟਾਉਣ ਲਈ ਸੋਧ ਕਰੋ + ਭਰੋਸੇਯੋਗ ਡੋਮੇਨ ਸੰਪਾਦਿਤ ਕਰੋ + ਪਹੁੰਚਯੋਗਤਾ + ਐਪ ਦੀ ਦਿੱਖ ਬਦਲੋ + ਪਹੁੰਚਯੋਗਤਾ ਪਰੋਫਾਈਲ + ਪਰਿਭਾਸ਼ਿਤ ਪ੍ਰੋਫਾਈਲ + ਪਰੋਫਾਈਲ + ਪਰਿਭਾਸ਼ਿਤ ਪ੍ਰੋਫਾਈਲ + ਇੱਕ ਪਰਿਭਾਸ਼ਿਤ ਐਕਸੈਸਿਬਿਲਟੀ ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ + ਟੈਕਸਟ ਦੀ ਦਿੱਖ + ਹੈਂਡਲਿੰਗ + ਵੱਡੇ ਆਈਕਾਨ + ਆਈਕਾਨ ਦਾ ਆਕਾਰ ਵਧਾਓ. + ਉੱਚ ਵਿਪਰੀਤ ਆਈਕਾਨ + ਆਈਕਾਨ + ਆਈਕਾਨ ਵੇਖਾਓ + ਸ਼੍ਰੇਣੀਆਂ ਅਤੇ ਇੱਟਾਂ ਤੇ ਆਈਕਾਨ ਸ਼ਾਮਲ ਕਰੋ. + ਉੱਚ ਵਿਪਰੀਤ + ਟੈਕਸਟ ਦੇ ਵਿਪਰੀਤ ਨੂੰ ਵਧਾਓ. + ਟੈਕਸਟ ਦਾ ਆਕਾਰ ਵਧਾਓ. + ਵੱਡਾ ਟੈਕਸਟ + ਵੱਡੀ ਤੱਤ ਦੀ ਦੂਰੀ + ਸੂਚੀਆਂ ਵਿੱਚ ਐਲੀਮੈਂਟ ਸਪੇਸ ਵਧਾਓ. + ਖਿੱਚੋ + ਇੱਟਾਂ ਲਈ ਖਿੱਚੋ. + ਸ਼ੁਰੂਆਤੀ ਮੋਡ + ਸਿਰਫ ਸਧਾਰਣ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਦਿਖਾਓ. + ਇੱਕ ਪਾਠ ਕਿਸਮ ਚੁਣੋ + ਰੋਜਾਨਾ + ਸੀਰੀਫ + ਡਿਸਲੈਕਸਿਕ + ਤਬਦੀਲੀਆਂ ਲਾਗੂ ਕੀਤੀਆਂ + ਮੂਲ + ਡਿਫੌਲਟ ਸੈਟਿੰਗਾਂ + ਮੇਰੀ ਕਸਟਮ ਪ੍ਰੋਫਾਈਲ + ਮੇਰੀਆਂ ਨਿੱਜੀ ਸੈਟਿੰਗਾਂ + ਅਰਗਸ + ਉੱਚ ਵਿਪਰੀਤ, ਵਾਧੂ ਆਈਕਾਨ + ਓਡਿਨ + ਵੱਡਾ ਟੈਕਸਟ, ਵੱਡੇ ਆਈਕਾਨ, ਵੱਡਾ ਐਲੀਮੈਂਟ + ਖਾਲੀ ਥਾਂ, ਉੱਚ ਵਿਪਰੀਤ + ਫੈਨਰ + ਵੱਡਾ ਤੱਤ ਸਪੇਸਿੰਗ, ਡਰੈਗ ਇਨਡ੍ਰੌਪ + ਦੇਰੀ + ਤਿਰੋ + ਸ਼ੁਰੂਆਤੀ ਮੋਡ + + ਤੋਤਾ ਏਆਰ ਡ੍ਰੋਨ 2.0 ਐਕਸਟੈਂਸ਼ਨ + ਐਪ ਨੂੰ ਤੋਤਾ ਏਆਰ.ਡ੍ਰੋਨ 2.0 ਕਵਾਡਕਾੱਪਟਰਸ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਤੋਤੇ ਜੰਪਿੰਗ ਸੂਮੋ ਐਕਸਟੈਂਸ਼ਨ + ਐਪ ਨੂੰ ਤੋਤੇ ਦੇ ਜੰਪਿੰਗ ਸੁਮੋ ਰੋਬੋਟਸ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਲੇਗੋ ਮਾਈਂਡਸਟੋਰਮਜ਼ ਐਨਐਕਸਟੀ ਐਕਸਟੈਂਸ਼ਨ + ਲੇਗੋ ਮਾਈਂਡਸਟਾਰਮਜ਼ ਈਵੀ 3 ਐਕਸਟੈਂਸ਼ਨ + ਐਪ ਨੂੰ ਲੇਗੋ ਮਾਈਂਡਸਟਾਰਮਜ਼ ਐਨਐਕਸਟੀ ਰੋਬੋਟਸ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਐਪ ਨੂੰ ਲੇਗੋ ਮਾਈਂਡਸਟਾਰਮਜ਼ ਈਵੀ 3 ਰੋਬੋਟਸ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਲੇਗੋ ਐਨਐਕਸਟੀ ਸੈਂਸਰ + ਲੇਗੋ ਈਵੀ 3 ਸੈਂਸਰ + ਤੋਤਾ ਏਆਰ.ਡ੍ਰੋਨ 2.0 ਕੌਂਫਿਗਰੇਸ਼ਨ + ਰੋਬੋਟਿਕਸਦੂ ਦਾ ਫੀਰੋ ਐਕਸਟੈਂਸ਼ਨ + ਐਪ ਨੂੰ ਰੋਬੋਟਿਕਸ ਈਡੂ ਦੇ ਫੀਰੋ ਰੋਬੋਟਸ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਅਰੂਦਿਨੋ ਐਕਸਟੈਂਸ਼ਨ + ਐਪ ਨੂੰ ਅਰਦਿਨੋ ਬੋਰਡਾਂ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਕroਾਈ ਦਾ ਵਿਸਥਾਰ + ਸਿਲਾਈ ਮਸ਼ੀਨਾਂ ਲਈ ਪੈਟਰਨ ਤਿਆਰ ਕਰੋ + ਕਰੋਮਕਾਸਟ ਐਕਸਟੈਂਸ਼ਨ + ਕਾਸਟ ਬਟਨ ਦਿਖਾਓ ਅਤੇ ਕਾਸਟ ਪ੍ਰੋਜੈਕਟਸ ਨੂੰ ਸਮਰੱਥ ਕਰੋ + ਫੀਲਡ ਕਮਿicationਨੀਕੇਸ਼ਨ ਐਕਸਟੈਂਸ਼ਨ ਦੇ ਨੇੜੇ + ਐਪ ਨੂੰ ਪ੍ਰੋਜੈਕਟਾਂ ਵਿੱਚ NFC ਟੈਗਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਅਗਿਆਤ ਕਰੈਸ਼ ਰਿਪੋਰਟਾਂ ਭੇਜ ਰਿਹਾ ਹੈ + ਐਪ ਨੂੰ ਕਰੈਸ਼ ਰਿਪੋਰਟਾਂ ਆਪਣੇ ਆਪ ਭੇਜਣ ਦੀ ਆਗਿਆ ਦਿਓ + + ਰਸਬੇਰੀ ਪਾਈ ਪਸਾਰ + ਐਪ ਨੂੰ ਰਸਬੇਰੀ ਪੀ ਕੰਪਿ computersਟਰਾਂ ਨੂੰ ਨਿਯੰਤਰਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ + ਇੱਟਾਂ ਅਤੇ ਸੈਂਸਰਾਂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ + ਮਦਦ / ਸ਼ੁਰੂਆਤ + ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗਜ਼ ਨੂੰ ਕੌਂਫਿਗਰ ਕਰਨ ਲਈ ਕਿਵੇਂ ਸਹਾਇਤਾ ਲਓ + ਰਸਬੇਰੀ ਪੀ ਆਈ ਪੀ- / ਹੋਸਟ-ਪਤਾ + ਰਸਬੇਰੀ ਪੋਰਟ ਪੋਰਟ + + ਮਲਟੀਪਲੇਅਰ ਐਕਸਟੈਂਸ਼ਨ + ਐਪ ਨੂੰ ਵਰਤਣ ਦੀ ਆਗਿਆ ਦਿਓ + ਮਲਟੀਪਲੇਅਰ ਵੇਰੀਏਬਲ ਬਲੂਟੁੱਥ ਦੁਆਰਾ ਸਾਂਝੇ ਕੀਤੇ + ਪਰੀਖਿਆ ਦਾ ਵਿਸਥਾਰ + ਟੈਸਟ ਬਣਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ + + ਬੀਟਾ + ਓਹ! ਲੱਗਦਾ ਹੈ ਕਿ ਪ੍ਰੋਜੈਕਟ ਗਾਇਬ ਹੋ ਗਿਆ ਹੈ + ਜਾਂ ਤੁਸੀਂ ਇਸ ਦੀ ਪਹੁੰਚ ਗੁਆ ਸਕਦੇ ਹੋ. + ਵੂਪਸ! ਯੋਜਨਾ ਦੇ ਕੁਝ ਹਿੱਸੇ ਲੱਗਦੇ ਹਨ + ਲਾਪता, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਮੁੜ ਵਿਚਾਰ ਕਰੋ. + ਓਹ! ਸਾਡੇ ਸਰਵਰ ਨੇ ਸਮੇਂ ਤੇ ਜਵਾਬ ਨਹੀਂ ਦਿੱਤਾ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ. + ਓਹ! ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਬਦਲਣ ਵਿੱਚ ਅਸਫਲ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ + ਬਾਅਦ ਵਿਚ. + ਓਹ! %1$s ਨੂੰ ਬਦਲਣ ਵਿੱਚ ਅਸਫਲ, ਕੋਸ਼ਿਸ਼ ਕਰੋ + ਦੁਬਾਰਾ ਬਾਅਦ ਵਿਚ. + ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਤੁਹਾਡੇ ਸੰਸਕਰਣ ਪੁਰਾਣਾ ਹੈ. ਸਾਡੇ ਖਰਚ + ਕਨਵਰਟਰ ਸਿਰਫ ਤਾਜ਼ੇ ਸੰਸਕਰਣਾਂ \'ਤੇ ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ. ਕਿਰਪਾ ਕਰਕੇ ਏਪ ਕੋ ਅਪਡੇਟ ਕਰੋ. + ਮੈਂ ਇਸ ਸਕ੍ਰੈਚ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਨਹੀਂ ਖੋਲ੍ਹ ਸਕਿਆ. ਇਹ ਲਗਦਾ ਹੈ ਕਿ ਤੁਸੀਂ + ਨੇ ਸਕ੍ਰੈਚ ਪ੍ਰੋਜੈਕਟ ਦੇ ਰੂਪਾਂਤਰਣ / ਡਾ downloadਨਲੋਡ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ, ਜਾਂ ਤੁਸੀਂ ਪ੍ਰੋਜੈਕਟ ਦਾ ਨਾਮ ਬਦਲਿਆ / ਮਿਟਾ ਦਿੱਤਾ ਹੈ + ਇਸ ਦੌਰਾਨ. + ਤੁਸੀਂ ਅਜੇ ਵੀ ਪ੍ਰੋਜੈਕਟ ਨਹੀਂ ਖੋਲ੍ਹ ਸਕਦੇ. + ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ ਜਦੋਂ ਤੱਕ ਇਹ ਡਾedਨਲੋਡ ਨਹੀਂ ਹੁੰਦਾ. + ਤੁਸੀਂ ਅਜੇ ਵੀ ਪ੍ਰੋਜੈਕਟ ਨਹੀਂ ਖੋਲ੍ਹ ਸਕਦੇ. + ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਪਹਿਲਾਂ ਡਾਉਨਲੋਡ ਕਰੋ ਅਤੇ ਫਿਰ ਇਸਨੂੰ ਖੋਲ੍ਹੋ. + ਮੈਂ %1$s ਨੂੰ ਤਬਦੀਲ ਨਹੀਂ ਕਰ ਸਕਿਆ. ਅਜਿਹਾ ਲਗਦਾ ਹੈ + %2$s ਤੋਂ ਪਹਿਲਾਂ ਦਾ ਇੱਕ ਪੁਰਾਣਾ ਸਕ੍ਰੈਚ ਪ੍ਰੋਜੈਕਟ. ਕਿਰਪਾ ਕਰਕੇ ਹੋਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ. + + ਤੁਸੀਂ ਇੱਕੋ ਸਮੇਂ %d ਪ੍ਰੋਜੈਕਟ ਤੋਂ ਵੱਧ ਨਹੀਂ ਬਦਲ ਸਕਦੇ. ਲਈ ਉਡੀਕ ਕਰੋ ਜੀ + ਪਹਿਲਾਂ ਖਤਮ ਕਰਨ ਲਈ ਚਲ ਰਹੇ ਪਰਿਵਰਤਨ. +ਤੁਸੀਂ ਇੱਕੋ ਸਮੇਂ %d ਪ੍ਰੋਜੈਕਟਾਂ ਤੋਂ ਵੱਧ ਨਹੀਂ ਬਦਲ ਸਕਦੇ. ਲਈ ਉਡੀਕ ਕਰੋ ਜੀ + ਪਹਿਲਾਂ ਖਤਮ ਕਰਨ ਲਈ ਚਲ ਰਹੇ ਪਰਿਵਰਤਨ. + ਤੁਸੀਂ ਇੱਕੋ ਸਮੇਂ %d ਪ੍ਰੋਜੈਕਟਾਂ ਤੋਂ ਵੱਧ ਨਹੀਂ ਬਦਲ ਸਕਦੇ. ਲਈ ਉਡੀਕ ਕਰੋ ਜੀ + ਪਹਿਲਾਂ ਖਤਮ ਕਰਨ ਲਈ ਚਲ ਰਹੇ ਪਰਿਵਰਤਨ. + + ਤੁਸੀਂ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਨਹੀਂ ਖੋਲ੍ਹ ਸਕਦੇ ਕਿਉਂਕਿ ਇਹ ਸਹੀ ਰੂਪ ਵਿੱਚ ਨਹੀਂ ਬਦਲਿਆ ਗਿਆ ਸੀ. ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਦੁਬਾਰਾ ਬਦਲਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ. + ਕੁਝ ਨਹੀਂ ਮਿਲਿਆ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ. + ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਗੁੰਮ ਗਿਆ. + ਅਸੀਂ ਤੁਹਾਨੂੰ ਹੁਣੇ ਸਰਵਰ ਨਾਲ ਨਹੀਂ ਜੋੜ ਸਕਦੇ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ. + ਸੇਵਾ ਨਾਲ ਤੁਹਾਡੇ ਕਨੈਕਸ਼ਨ ਵਿਚ ਕੋਈ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ. ਕ੍ਰਿਪਾ ਕਰਕੇ + ਕੈਟ੍ਰੋਬੈਟ ਟੀਮ ਨਾਲ ਸੰਪਰਕ ਕਰੋ. + + %d ਸਕ੍ਰੈਚ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਕਤਾਰ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ… + %d ਸਕ੍ਰੈਚ ਪ੍ਰੋਜੈਕਟਾਂ ਨੂੰ ਕਤਾਰ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ… + + ਸਕ੍ਰੈਚ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਕਨਵਰਟ ਕਰਨ ਲਈ ਅਰੰਭ ਕੀਤਾ… + ਤਬਦੀਲ ਕਰੋ + ਬਦਲ ਰਿਹਾ ਹੈ… + ਤਹਿ + ਇੱਕ ਮੁਫਤ ਕਰਮਚਾਰੀ ਦੀ ਭਾਲ ਵਿੱਚ… ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ… + ਅਰੰਭ ਕੀਤਾ… + ਪਰਿਵਰਤਨ ਸਮਾਪਤ + + ਤਰੱਕੀ ਵਿੱਚ: %d ਨੌਕਰੀ +ਤਰੱਕੀ ਵਿੱਚ: %d ਨੌਕਰੀਆਂ + ਤਰੱਕੀ ਵਿੱਚ: %d ਨੌਕਰੀ +ਤਰੱਕੀ ਵਿੱਚ:%d ਨੌਕਰੀਆਂ + + + ਮੁਕੰਮਲ:%d ਨੌਕਰੀ +ਮੁਕੰਮਲ:%d ਨੌਕਰੀਆਂ + ਮੁਕੰਮਲ: %d ਨੌਕਰੀ +ਮੁਕੰਮਲ: %d ਨੌਕਰੀਆਂ + + ਤਬਦੀਲੀ ਫੇਲ੍ਹ ਹੋਈ! + ਡਾingਨਲੋਡ ਕਰ ਰਿਹਾ ਹੈ… + ਡਾ Downloadਨਲੋਡ ਮੁਕੰਮਲ. + ਡਾ canceledਨਲੋਡ ਰੱਦ! + ਤਰੱਕੀ ਹੋ ਰਹੀ ਹੈ + ਪਰਿਵਰਤਿਤ ਪ੍ਰੋਜੈਕਟ + %1$s ਦੁਆਰਾ + ਚੇਤਾਵਨੀ: \n ਇਹ ਇੱਕ ਨਿਜੀ ਪ੍ਰੋਜੈਕਟ ਜਾਪਦਾ ਹੈ. ਤੁਸੀਂ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ + ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰੋ ਪਰ ਇਹ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ. + ਨਿਰਦੇਸ਼ + ਨੋਟਸ ਅਤੇ ਕ੍ਰੈਡਿਟ + ਸਾਂਝਾ ਕੀਤਾ: %1$s + ਸੋਧਿਆ: %1$s + ਰੀਮਿਕਸ + + ਲੇਖਕ: + ਪੜਾਅ ਦਾ ਆਕਾਰ: + ਮੋਡ: + ਦਾ ਰੀਮਿਕਸ: + ਵੇਰਵਾ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਦਬਾਓ + ਨੋਟ ਅਤੇ ਕ੍ਰੈਡਿਟ ਜੋੜਨ ਲਈ ਦਬਾਓ + + ਤੁਸੀਂ ਇਸ ਪ੍ਰੋਜੈਕਟ ਨੂੰ %1$s ਪਹਿਲਾਂ ਬਦਲਿਆ ਹੈ. + + %d ਮਿੰਟ +%d ਮਿੰਟ + %d ਮਿੰਟ +%d ਮਿੰਟ + + + % dਘੰਟਾ +% dਘੰਟੇ + %d ਘੰਟਾ +%d ਘੰਟੇ + + + %d ਦਿਨ +%d ਦਿਨ + %d ਦਿਨ +%d ਦਿਨ + + ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਦੁਬਾਰਾ ਡਾਉਨਲੋਡ ਕਰੋ + ਇਸ ਪ੍ਰਾਜੈਕਟ ਨੂੰ ਦੁਬਾਰਾ ਬਦਲੋ + + + + ਸਾਡੇ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਸਾਡੀ ਵਰਤੋਂ ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਤੇ ਸੇਵਾ ਨੂੰ ਸਵੀਕਾਰ ਕਰਨਾ ਜ਼ਰੂਰੀ ਹੈ. + ਹਾਲਾਂਕਿ, ਜੇ ਤੁਸੀਂ ਅਜਿਹਾ ਕਰਨਾ ਆਰਾਮਦੇਹ ਮਹਿਸੂਸ ਨਹੀਂ ਕਰਦੇ, ਤਾਂ ਤੁਸੀਂ ਸਾਡੀ ਮੁਫਤ ਵੈਬ ਸੇਵਾਵਾਂ ਨੂੰ ਵਰਤ ਸਕਦੇ ਹੋ + ਇੱਕ ਅਚਾਨਕ ਗਲਤੀ ਆਈ: ਮੈਂ ਨਮੂਨਾ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਿਆ. + + ਪ੍ਰੋਜੈਕਟ ਦੀ ਨਕਲ ਕਰਨ ਦੌਰਾਨ ਇੱਕ ਤਰੁੱਟੀ ਉਤਪੰਨ ਹੋਈ + + ਇਹ ਨਾਮ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਹੋਰ ਚੁਣੋ. + ਤੁਸੀਂ ਸਿਰਫ ਟੈਕਸਟ ਫੀਲਡ ਵਿੱਚ ਖਾਲੀ ਥਾਂਵਾਂ ਰੱਖੀਆਂ, ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਟੈਕਸਟ ਭਰੋ + ਅੱਖਰ, ਨੰਬਰ ਜਾਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ ਪਾਤਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨਾ. + ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਪਾਠ ਦਾਖਲ ਕਰੋ + + ਇਸ ਸੂਚੀ ਵਿਚ ਅਜੇ ਵੀ ਕੋਈ ਚੀਜ਼ਾਂ ਨਹੀਂ ਹਨ. ਕਿਰਪਾ ਕਰਕੇ ਪਹਿਲਾਂ ਕੁਝ ਸ਼ਾਮਲ ਕਰੋ. + ਕੋਈ ਮਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਂਦੀ. ਵਿਲੱਖਣ ਰੂਪ ਵਿੱਚ 2 ਪ੍ਰੋਜੈਕਟਾਂ ਨੂੰ ਚੁਣਨ ਦੀ ਜ਼ਰੂਰਤ ਹੈ. + ਪੈਕ + ਅਨਪੈਕ + ਕਾੱਪੀ + ਮਿਟਾਓ + ਨਾਮ ਬਦਲੋ + ਤਬਦੀਲ ਕਰੋ + ਮਿਲਾਓ + ਤੁਸੀਂ ਇਸ ਨੂੰ ਵਾਪਸ ਨਹੀਂ ਕਰ ਸਕਦੇ! + ਅਦਾਕਾਰ ਅਤੇ ਆਬਜੈਕਟ + + ਬੈਕਪੈਕ + ਕਾੱਪੀ + ਮਿਟਾਓ + ਨਾਮ ਬਦਲੋ + ਮਿਲਾਓ + ਵੇਰਵਾ ਦਿਖਾਓ + ਵੇਰਵੇ ਲੁਕਾਓ + ਪ੍ਰੋਜੈਕਟ ਵਿਕਲਪ + ਲੜੀਬੱਧ + ਅਣਸੋਰਟ + + ਨਵਾਂ ਦ੍ਰਿਸ਼ + + + ਇਸ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਇਹ ਪ੍ਰੋਜੈਕਟ ਹਟਾਓ? + ਇਸ ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਇਹ ਪ੍ਰੋਜੈਕਟ ਹਟਾਓ? + + + ਇਸ ਸੀਨ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਇਹ ਦ੍ਰਿਸ਼ ਮਿਟਾਉਣੇ ਹਨ? + ਇਸ ਸੀਨ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਇਹ ਦ੍ਰਿਸ਼ ਮਿਟਾਉਣੇ ਹਨ? + + + ਇਸ ਅਭਿਨੇਤਾ ਜਾਂ ਆਬਜੈਕਟ ਨੂੰ ਮਿਟਾਓ? +ਇਹ ਅਦਾਕਾਰਾਂ ਜਾਂ ਆਬਜੈਕਟਸ ਨੂੰ ਮਿਟਾਓ? + ਇਸ ਅਭਿਨੇਤਾ ਜਾਂ ਆਬਜੈਕਟ ਨੂੰ ਮਿਟਾਓ? +ਇਹ ਅਦਾਕਾਰਾਂ ਜਾਂ ਆਬਜੈਕਟਸ ਨੂੰ ਮਿਟਾਓ? + + + ਇਸ ਦਿੱਖ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਕੀ ਇਹ ਦਿੱਖ ਮਿਟਾਉਣੇ ਹਨ? + ਇਸ ਦਿੱਖ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਕੀ ਇਹ ਦਿੱਖ ਮਿਟਾਉਣੇ ਹਨ? + + + ਇਸ ਆਵਾਜ਼ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਕੀ ਇਹ ਆਵਾਜ਼ਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? + ਇਸ ਆਵਾਜ਼ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਕੀ ਇਹ ਆਵਾਜ਼ਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? + + + ਇਸ ਟੈਗ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਕੀ ਇਹ ਟੈਗ ਮਿਟਾਉਣੇ ਹਨ? + ਇਸ ਟੈਗ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਕੀ ਇਹ ਟੈਗ ਮਿਟਾਉਣੇ ਹਨ? + + + ਇਸ ਸਕ੍ਰਿਪਟ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਇਹ ਸਕ੍ਰਿਪਟਾਂ ਮਿਟਾਉਣੀਆਂ ਹਨ? + ਇਸ ਸਕ੍ਰਿਪਟ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? +ਇਹ ਸਕ੍ਰਿਪਟਾਂ ਮਿਟਾਉਣੀਆਂ ਹਨ? + + + ਪ੍ਰੋਜੈਕਟ ਦਾ ਨਾਮ + ਸੀਨ ਨਾਮ + ਅਦਾਕਾਰ ਜਾਂ ਇਕਾਈ ਦਾ ਨਾਮ + ਸਮੂਹ ਦਾ ਨਾਮ + ਸਕ੍ਰਿਪਟ ਸਮੂਹ ਦਾ ਨਾਮ + ਨਾਮ ਦੇਖੋ + ਅਵਾਜ਼ ਦਾ ਨਾਮ + NFC tag name + ਟੈਕਸਟ + ਨਾਮ + ਕੀਵਰਡ ਪਾਓ + HTML ਟੈਕਸਟ ਸੰਮਿਲਿਤ ਕਰੋ + ਚਿੱਤਰ ਫਾਰਮੈਟ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ + + ਆਖਰੀ ਐਕਸੈਸ: %s, ਅਕਾਰ: %s + ਅੱਜ %s + ਅਦਾਕਾਰ ਅਤੇ ਆਬਜੈਕਟ: %d, ਦਿੱਸਦਾ ਹੈ: %d, ਆਵਾਜ਼ਾਂ: %d + ਇੱਟਾਂ: %d, ਲੱਗੀਆਂ: %d, ਆਵਾਜ਼ਾਂ: %d + ਰੈਜ਼ੋਲੇਸ਼ਨ: %s, ਅਕਾਰ: %s + ਅੰਤਰਾਲ: %s + ਅੰਤਰਾਲ: %s, ਅਕਾਰ: %s + + + ਪ੍ਰੋਜੈਕਟ ਦਾ ਨਾਮ ਬਦਲੋ + ਸੀਨ ਦਾ ਨਾਮ ਬਦਲੋ + ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ ਦਾ ਨਾਮ ਬਦਲੋ + ਰੂਪ ਬਦਲੋ + ਆਵਾਜ਼ ਦਾ ਨਾਮ ਬਦਲੋ + ਬਦਲੋ NFC ਟੈਗ + ਨਾਮ ਬਦਲੋ + + ਨਵਾਂ ਸਮੂਹ + ਸਮੂਹ + + ਨਵਾਂ ਦ੍ਰਿਸ਼ + + + + ਬੈਕਪੈਕਡ %d ਸੀਨ. +ਬੈਕਪੈਕਡ %d ਦ੍ਰਿਸ਼. + ਬੈਕਪੈਕਡ %d ਸੀਨ. +ਬੈਕਪੈਕਡ %d ਦ੍ਰਿਸ਼. + + + ਬੈਕਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ. +ਬੈਕਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ. + ਬੈਕਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ. +ਬੈਕਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ. + + + ਬੈਕਪੈਕਡ %d ਲੁੱਕ. +ਬੈਕਪੈਕਡ %d ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ. + ਬੈਕਪੈਕਡ %d ਲੁੱਕ. +ਬੈਕਪੈਕਡ %d ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ. + + + ਬੈਕਪੈਕਡ %d ਅਵਾਜ਼. +ਬੈਕਪੈਕਡ %d ਆਵਾਜ਼ਾਂ. + ਬੈਕਪੈਕਡ %d ਅਵਾਜ਼. +ਬੈਕਪੈਕਡ %d ਆਵਾਜ਼ਾਂ. + + ਇੱਕ ਸਕ੍ਰਿਪਟ ਸਮੂਹ ਨੂੰ ਬੈਕਪੈਕ ਕੀਤਾ ਗਿਆ. + + + ਅਨਪੈਕਡ %d ਸੀਨ. +ਪੈਕ ਕੀਤੇ %d ਦ੍ਰਿਸ਼. + ਅਨਪੈਕਡ %d ਸੀਨ. +ਪੈਕ ਕੀਤੇ %d ਦ੍ਰਿਸ਼. + + + ਅਨਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ. +ਅਨਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ + ਅਨਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ. +ਅਨਪੈਕਡ %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ + + + ਅਨਪੈਕਡ %d ਲੁੱਕ. +ਅਨਪੈਕਡ %d ਦਿੱਖ. + ਅਨਪੈਕਡ %d ਲੁੱਕ. +ਅਨਪੈਕਡ %d ਦਿੱਖ. + + + ਅਨਪੈਕਡ %d ਆਵਾਜ਼. +ਅਨਪੈਕਡ %d ਆਵਾਜ਼ਾਂ. + ਅਨਪੈਕਡ %d ਆਵਾਜ਼. +ਅਨਪੈਕਡ %d ਆਵਾਜ਼ਾਂ. + + + ਅਨਪੈਕਡ %d ਸਕ੍ਰਿਪਟ. +ਅਨਪੈਕਡ %d ਸਕ੍ਰਿਪਟਾਂ. + ਅਨਪੈਕਡ %d ਸਕ੍ਰਿਪਟ. +ਅਨਪੈਕਡ %d ਸਕ੍ਰਿਪਟਾਂ. + + + + %d ਸੀਨ ਦੀ ਨਕਲ ਕੀਤੀ. +%d ਦ੍ਰਿਸ਼ ਨਕਲ ਕੀਤੇ. + %d ਸੀਨ ਦੀ ਨਕਲ ਕੀਤੀ. +%d ਦ੍ਰਿਸ਼ ਨਕਲ ਕੀਤੇ. + + + %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ ਦੀ ਨਕਲ ਕੀਤੀ. +%d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ ਕਾਪੀ ਕੀਤੇ ਗਏ. + %d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ ਦੀ ਨਕਲ ਕੀਤੀ. +%d ਅਦਾਕਾਰ ਜਾਂ ਆਬਜੈਕਟ ਕਾਪੀ ਕੀਤੇ ਗਏ. + + + %d ਲੁੱਕ ਨਕਲ ਕੀਤਾ. +%d ਦਿਖਾਈ ਗਈ ਹੈ. + %d ਲੁੱਕ ਨਕਲ ਕੀਤਾ. +%d ਦਿਖਾਈ ਗਈ ਹੈ. + + + %d ਧੁਨੀ ਨਕਲ ਕੀਤੀ. +%d ਧੁਨੀਆਂ ਦੀ ਨਕਲ ਕੀਤੀ. + %d ਧੁਨੀ ਨਕਲ ਕੀਤੀ. +%d ਧੁਨੀਆਂ ਦੀ ਨਕਲ ਕੀਤੀ. + + + %d NFC ਟੈਗ ਦੀ ਨਕਲ ਕੀਤੀ. +%d ਐਨਐਫਸੀ ਟੈਗ ਦੀ ਨਕਲ ਕੀਤੀ. + %d NFC ਟੈਗ ਦੀ ਨਕਲ ਕੀਤੀ. +%d ਐਨਐਫਸੀ ਟੈਗ ਦੀ ਨਕਲ ਕੀਤੀ. + + + + ਪ੍ਰੋਜੈਕਟ %d ਹਟਾਇਆ. +%d ਪ੍ਰੋਜੈਕਟ ਹਟਾਏ ਗਏ. + ਪ੍ਰੋਜੈਕਟ %d ਹਟਾਇਆ. +%d ਪ੍ਰੋਜੈਕਟ ਹਟਾਏ ਗਏ. + + + %d ਸੀਨ ਹਟਾਇਆ ਗਿਆ. +%d ਸੀਨ ਹਟਾਏ ਗਏ. + %d ਸੀਨ ਹਟਾਇਆ ਗਿਆ. +%d ਸੀਨ ਹਟਾਏ ਗਏ. + + + %d ਸਪ੍ਰਾਈਟ ਮਿਟਾਇਆ ਗਿਆ. +%d ਸਪ੍ਰਾਈਟਸ ਮਿਟਾਏ ਗਏ. + %d ਸਪ੍ਰਾਈਟ ਮਿਟਾਇਆ ਗਿਆ. +%d ਸਪ੍ਰਾਈਟਸ ਮਿਟਾਏ ਗਏ. + + + %d ਲੁੱਕ ਮਿਟਾਈ ਗਈ. +ਹਟਾਈਆਂ %d ਦਿੱਸੀਆਂ. + %d ਲੁੱਕ ਮਿਟਾਈ ਗਈ. +ਹਟਾਈਆਂ %d ਦਿੱਸੀਆਂ. + + + %d ਆਵਾਜ਼ ਮਿਟਾਈ ਗਈ. +%d ਆਵਾਜ਼ਾਂ ਮਿਟਾ ਦਿੱਤੀਆਂ. + %d ਆਵਾਜ਼ ਮਿਟਾਈ ਗਈ. +%d ਆਵਾਜ਼ਾਂ ਮਿਟਾ ਦਿੱਤੀਆਂ. + + + %d NFC ਟੈਗ ਮਿਟਾਇਆ ਗਿਆ. +%d NFC ਟੈਗਸ ਮਿਟਾਏ ਗਏ. + %d NFC ਟੈਗ ਮਿਟਾਇਆ ਗਿਆ. +%d NFC ਟੈਗਸ ਮਿਟਾਏ ਗਏ. + + + %d ਸਕ੍ਰਿਪਟ ਮਿਟਾਈ ਗਈ. +%d ਸਕ੍ਰਿਪਟਾਂ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ. + %d ਸਕ੍ਰਿਪਟ ਮਿਟਾਈ ਗਈ. +%d ਸਕ੍ਰਿਪਟਾਂ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ. + + + %d ਆਈਟਮ ਮਿਟਾਈ ਗਈ. +%d ਆਈਟਮਾਂ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ. + %d ਆਈਟਮ ਮਿਟਾਈ ਗਈ. +%d ਆਈਟਮਾਂ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ. + + + + ਪ੍ਰੋਜੈਕਟ + ਆਖਰੀ ਪਹੁੰਚ: + ਆਕਾਰ: + ਵੇਰਵਾ: + ਵੇਰਵਾ ਸੈੱਟ ਕਰੋ + ਨੋਟਸ ਅਤੇ ਕ੍ਰੈਡਿਟ: + ਨੋਟ ਅਤੇ ਕ੍ਰੈਡਿਟ ਸੈਟ ਕਰੋ + ਅੱਜ + ਅਯਾਤ ਪ੍ਰੋਜੈਕਟ + ਪ੍ਰੋਜੈਕਟਸ ਨੂੰ ਆਯਾਤ ਕਰਨ ਵੇਲੇ ਕੁਝ ਗਲਤ ਹੋਇਆ. + ਕੋਈ ਪ੍ਰੋਜੈਕਟ ਫਾਈਲਾਂ ਨਹੀਂ ਮਿਲੀਆਂ. + + ਵੇਰਵਾ + ਨੋਟ ਅਤੇ ਕ੍ਰੈਡਿਟ + ਟੈਗਸ + ਅਸਲ ਪੱਖ ਅਨੁਪਾਤ ਰੱਖੋ + ਹੋਰ ਜਾਣਕਾਰੀ + ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਮਿਟਾਓ + + ਸਕ੍ਰਿਪਟਾਂ ਨੂੰ ਜੋੜਨ ਲਈ \"+\" ਤੇ ਟੈਪ ਕਰੋ + + + ਅਦਾਕਾਰਾਂ ਜਾਂ ਆਬਜੈਕਟਾਂ ਨੂੰ ਜੋੜਨ ਲਈ \"+\" ਤੇ ਟੈਪ ਕਰੋ + ਮੇਰਾ ਅਦਾਕਾਰ ਜਾਂ ਵਸਤੂ + + + ਦਿੱਖ ਸ਼ਾਮਲ ਕਰਨ ਲਈ \"+\" ਤੇ ਟੈਪ ਕਰੋ + ਚਿੱਤਰ ਚੁਣੋ + ਫੋਟੋ ਦੀ ਚੋਣ ਕਰੋ + + + ਆਵਾਜ਼ਾਂ ਜੋੜਨ ਲਈ \"+\" ਤੇ ਟੈਪ ਕਰੋ + ਇੱਕ ਆਵਾਜ਼ ਚੁਣੋ + + + ਐੱਨ ਐੱਫ ਸੀ ਟੈਗਸ ਨੂੰ ਜੋੜਨ ਲਈ ਸਕੈਨ ਕਰੋ + ਰਿਕਾਰਡ ਦੀ ਕਿਸਮ ਦੇ ਤੌਰ ਤੇ + ਲਿਖਣ ਲਈ ਅਗਲੇ ਐਨਐਫਸੀ ਟੈਗ ਦੀ ਉਡੀਕ ਕਰੋ + www.catrobat.org + NFC ਟੈਗ + ਖਾਲੀ + ਬਾਹਰੀ ਕਿਸਮ + ਟੈਕਸਟ + HTTP + HTTPS + ਫੋਨ ਨੰਬਰ + SMS + E-Mail + + + ਕਨੈਕਟ ਕੀਤੇ ਡਿਵਾਈਸਾਂ ਲਈ ਵੇਰੀਏਬਲ + ਸਾਰੇ ਅਦਾਕਾਰਾਂ ਅਤੇ ਆਬਜੈਕਟ ਲਈ ਪਰਿਵਰਤਨ + ਸਿਰਫ ਇਸ ਅਦਾਕਾਰ ਜਾਂ ਇਕਾਈ ਲਈ ਪਰਿਵਰਤਨ + ਸਾਰੇ ਅਦਾਕਾਰਾਂ ਅਤੇ ਆਬਜੈਕਟ ਲਈ ਸੂਚੀਬੱਧ + ਸਿਰਫ ਇਸ ਅਦਾਕਾਰ ਜਾਂ ਇਕਾਈ ਲਈ ਸੂਚੀਬੱਧ + ਤਬਦੀਲੀਆਂ ਜਾਂ ਸੂਚੀਆਂ ਜੋੜਨ ਲਈ \"+\" ਤੇ ਟੈਪ ਕਰੋ + + ਇਸ ਇੱਟ ਲਈ ਇੰਪੁੱਟ +ਇਸ ਇੱਟ ਲਈ ਜਾਣਕਾਰੀ + ਇਸ ਇੱਟ ਲਈ ਇੰਪੁੱਟ +ਇਸ ਇੱਟ ਲਈ ਜਾਣਕਾਰੀ + + + ਸਾਰੇ ਦ੍ਰਿਸ਼ਾਂ ਵਿਚ ਸਾਰੇ ਅਭਿਨੇਤਾ, ਆਬਜੈਕਟ ਅਤੇ ਕਲੋਨ ਲਈ + ਇਸ ਅਦਾਕਾਰ, ਆਬਜੈਕਟ ਜਾਂ ਇਸਦੇ ਕਲੋਨ ਵਿੱਚੋਂ ਸਿਰਫ ਇੱਕ ਲਈ + ਪ੍ਰੋਜੈਕਟ ਦੇ ਸਾਰੇ ਦ੍ਰਿਸ਼ਾਂ ਵਿਚ ਸਾਰੇ ਅਦਾਕਾਰਾਂ, ਆਬਜੈਕਟਸ ਅਤੇ ਕਲੋਨਜ ਲਈ + ਜੁੜੇ ਮਲਟੀਪਲੇਅਰ ਡਿਵਾਈਸਾਂ ਤੇ + + ਤੁਹਾਡਾ ਬੈਕਪੈਕ + ਪੈਕ + ਅਨਪੈਕ + + + ਪ੍ਰਾਜੈਕਟ ਦੀ ਉਦਾਹਰਣ + + + ਮਰਜ ਪ੍ਰੋਜੈਕਟ + ਇਹ ਦੋਵੇਂ ਪ੍ਰੋਜੈਕਟ ਅਜੇ ਤੱਕ ਰਲੇ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ + + + ਨਵਾਂ ਅਦਾਕਾਰ ਜਾਂ ਇਕਾਈ + + + ਦਿੱਖ ਸ਼ਾਮਲ ਕਰੋ + ਤਸਵੀਰ ਲਓ + ਚਿੱਤਰ ਬਣਾਉ + ਚਿੱਤਰ ਚੁਣੋ + ਮੀਡੀਆ ਲਾਇਬ੍ਰੇਰੀ + + + ਆਵਾਜ਼ ਸ਼ਾਮਲ ਕਰੋ + ਰਿਕਾਰਡ ਆਵਾਜ਼ + ਫਾਈਲ ਚੁਣੋ + ਸੰਗੀਤ ਸੰਗੀਤਕਾਰ + + ਨੋਟ ਚੋਣਕਾਰ + + + ਰੇਟ ਐਪ + ਜੇ ਤੁਸੀਂ ਇਸ ਐਪ ਦਾ ਅਨੰਦ ਲੈਂਦੇ ਹੋ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਸਾਨੂੰ ਐਪ ਸਟੋਰ ਤੇ ਦਰਜਾ ਦਿਓ. + ਹੁਣ + ਬਾਅਦ ਵਿਚ + ਕਦੇ ਨਹੀਂ + + + ਵਰਤੋਂ ਅਤੇ ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ + ਨੂੰ ਕ੍ਰਮ ਵਿੱਚ + ਤੁਹਾਨੂੰ, ਕੈਟ੍ਰੋਬੈਟ ਪ੍ਰੋਜੈਕਟ ਦੁਆਰਾ ਪੇਸ਼ ਕੀਤੀਆਂ ਐਪਸ ਅਤੇ ਹੋਰ ਸੇਵਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੱਤੀ ਜਾਵੇ + ਸਾਡੀ ਵਰਤੋਂ ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਤੇ ਸੇਵਾ ਨਾਲ ਸਹਿਮਤ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ. ਸਾਡੇ ਐਪਸ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਸਮੇਂ ਤੁਹਾਨੂੰ ਇਨ੍ਹਾਂ ਸ਼ਰਤਾਂ ਦੀ ਸਖਤੀ ਨਾਲ ਪਾਲਣਾ ਕਰਨੀ ਪੈਂਦੀ ਹੈ + ਅਤੇ ਹੋਰ ਸੇਵਾਵਾਂ. ਕਿਰਪਾ ਕਰਕੇ ਉਨ੍ਹਾਂ ਦੇ ਸਹੀ ਫਾਰਮੂਲੇ ਲਈ ਹੇਠਾਂ ਦਿੱਤੇ ਲਿੰਕ ਨੂੰ ਵੇਖੋ.\n + ਵਰਤੋਂ ਅਤੇ ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ + + + ਸੁਆਗਤ ਹੈ + ਇਸ ਐਪਲੀਕੇਸ਼ ਨੂੰ ਵਰਤਣ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਸਾਡੀ ਸਵੀਕਾਰ ਕਰੋ + + + ਇਸ ਐਪ ਬਾਰੇ + ਇਹ ਐਪ ਕੋਡਿੰਗ ਦੀ ਪੇਸ਼ਕਸ਼ ਕਰਦਾ ਹੈ + ਦਿੱਖ ਪ੍ਰੋਗਰਾਮਿੰਗ ਭਾਸ਼ਾ ਕੈਟ੍ਰੋਬੈਟ ਲਈ ਵਾਤਾਵਰਣ ਅਤੇ ਦੁਭਾਸ਼ੀਏ.\n + ਇਸ ਐਪਲੀਕੇਸ਼ ਨੂੰ ਦੇ ਸਰੋਤ ਕੋਡ ਮੁੱਖ ਤੌਰ \'ਤੇ ਗਨੂ ਵਿੱਚ AGPL v3 ਲਾਇਸੰਸ ਅਧੀਨ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ. + ਲਾਇਸੈਂਸ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਹੇਠਾਂ ਦਿੱਤਾ ਲਿੰਕ ਵੇਖੋ.\n + ਸਰੋਤ ਕੋਡ ਲਾਇਸੈਂਸ + ਕੈਟਰੋਬੈਟ ਬਾਰੇ + ਕੈਟ੍ਰੋਬੈਟ ਭਾਸ਼ਾ ਦਾ ਸੰਸਕਰਣ + ਵਰਜਨ: + + + ਕੋਈ ਨੈੱਟਵਰਕ ਨਹੀਂ + + ਅੱਪਲੋਡ ਪ੍ਰਾਜੈਕਟ ਨੂੰ + ਵੇਰਵਾ: + ਨੋਟਸ ਅਤੇ ਕ੍ਰੈਡਿਟ: + ਤੁਸੀਂ ਇਹ ਪ੍ਰੋਜੈਕਟ ਕਿਵੇਂ ਬਣਾਇਆ? ਕੀ ਤੁਸੀਂ ਦੂਜੇ ਲੋਕਾਂ ਦੇ ਵਿਚਾਰਾਂ, ਸਕ੍ਰਿਪਟਾਂ ਜਾਂ ਕਲਾਕਾਰੀ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਹੈ? ਇਥੇ ਉਨ੍ਹਾਂ ਦਾ ਧੰਨਵਾਦ ਕਰੋ. + ਕਿਰਪਾ ਕਰਕੇ ਤਿੰਨ ਸ਼੍ਰੇਣੀਆਂ ਦੀ ਚੋਣ ਕਰੋ + 3 ਤੋਂ ਵੱਧ ਟੈਗ ਚੁਣਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ. + + ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਬਾਹਰੀ ਸਟੋਰੇਜ ਤੇ ਸੁਰੱਖਿਅਤ ਕਰੋ + " " + ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਬਾਹਰੀ ਸਟੋਰੇਜ ਵਿੱਚ ਸੁਰੱਖਿਅਤ ਕਰਨਾ + " " + "ਪ੍ਰੋਜੈਕਟ ਨੂੰ %1$s ਤੇ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ" + ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ, ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ! + + + ਆਵਾਜ਼ ਰਿਕਾਰਡਰ + ਧੁਨੀ ਰਿਕਾਰਡਿੰਗ ਅਸਫਲ + ਰਿਕਾਰਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ + ਰਿਕਾਰਡਿੰਗ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਅਤੇ ਰੋਕਣ ਲਈ ਉਪਰੋਕਤ ਆਈਕਾਨ ਤੇ ਟੈਪ ਕਰੋ. + + + ਇੱਟ ਮੂਵ ਕਰੋ + ਲਿਪੀ ਸਕ੍ਰਿਪਟ + ਇਸ ਪਰਿਭਾਸ਼ਾ ਨੂੰ ਹਿਲਾਓ + ਇੱਟ ਮਿਟਾਓ + ਇੱਟ ਕਾਪੀ ਕਰੋ + ਸਕ੍ਰਿਪਟ ਕਾਪੀ ਕਰੋ + ਫਾਰਮੂਲਾ ਸੋਧੋ + ਸਕ੍ਰਿਪਟ ਮਿਟਾਓ + ਇਸ ਪਰਿਭਾਸ਼ਾ ਨੂੰ ਮਿਟਾਓ + ਇੱਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ + ਇੱਟ ਨੂੰ ਅਯੋਗ ਕਰੋ + ਇੱਟ ਦੇ ਹਿੱਸੇ ਉਜਾਗਰ ਕਰੋ + ਸਕ੍ਰਿਪਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ + ਸਕ੍ਰਿਪਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ + ਮਦਦ ਕਰੋ + ਨੂੰ ਯੋਗ ਆਯੋਗ ਕਰੋ + ਟੌਗਲ 2 ਡੀ + ਸਕ੍ਰਿਪਟਾਂ ਸਾਫ਼ ਕਰੋ + 1 ਡੀ ਦ੍ਰਿਸ਼ + + + ਖੇਡੋ ਦ੍ਰਿਸ਼: + ਪਹਿਲਾ ਸੀਨ (%1$s) + ਪਹਿਲਾ ਸੀਨ (%1$s) + + + ਸਾਇਨ ਇਨ + ਯੂਜ਼ਰਨਾਮ + ਪਾਸਵਰਡ + ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰੋ + ਨਵਾਂ ਖਾਤਾ ਬਣਾਇਆ ਗਿਆ + ਲੌਗਇਨ ਸਫਲ + ਲਾਗਇਨ ਅਵੈਧ ਹੈ + ਰਜਿਸਟਰ ਕਰਕੇ ਤੁਸੀਂ ਸਾਡੇ ਨਾਲ ਸਹਿਮਤ ਹੋ + ਵਰਤੋਂ ਅਤੇ ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ + ਲਾਗਿਨ + ਰਜਿਸਟਰ + ਪਾਸਵਰਡ ਪੱਕਾ ਕਰੋ + E-Mail + ਸਾਈਨ ਅਪ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਧੰਨਵਾਦ! + ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਉਪਯੋਗਕਰਤਾ ਨਾਮ ਚੁਣੋ: + ਕ੍ਰਿਪਾ ਕਰਕੇ ਜਾਇਜ ਕਰਤਾ ਨਾਮ ਭਰੋ + ਉਪਯੋਗਕਰਤਾ ਨਾਮ ਤੁਹਾਡਾ ਅਸਲ ਨਾਮ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਅਤੇ ਨਾ ਹੀ ਇਹ ਇੱਕ ਈਮੇਲ ਪਤਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ. + ਕੋਈ ਹੋਰ ਪਹਿਲਾਂ ਹੀ ਇਹ ਨਾਮ ਵਰਤਦਾ ਹੈ. ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਵੱਖਰਾ ਚੁਣੋ! + ਪਾਸਵਰਡ ਦਿਖਾਓ + ਸਾਈਨ ਇਨ ਕਰਨ ਦੌਰਾਨ ਕੁਝ ਗਲਤ ਹੋਇਆ. + ਗੂਗਲ ਸਾਈਨ-ਇਨ ਗਲਤੀ. ਸਥਿਤੀ: %s + ਸੈਸ਼ਨ ਦੀ ਮਿਆਦ ਖਤਮ, ਕਿਰਪਾ ਕਰਕੇ ਲੌਗਇਨ ਕਰੋ. + ਖਾਲੀ ਨਾਂ + ਈਮੇਲ ਪਤਾ ਉਪਭੋਗਤਾ ਨਾਮ ਵਜੋਂ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ + ਉਪਭੋਗਤਾ ਨਾਮ ਵਿੱਚ ਸਿਰਫ ਅੱਖਰ (a – z), ਨੰਬਰ (0-9) ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ, + ਡੈਸ਼ (-), ਅੰਡਰਸਕੋਰਸ (_), ਅਤੇ ਪੀਰੀਅਡ (.). + ਉਪਯੋਗਕਰਤਾ ਨਾਮ ਡੈਸ਼ (-), ਅੰਡਰਸਕੋਰਸ (_), ਜਾਂ ਨਾਲ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ + ਪੀਰੀਅਡ (.). + ਗਲਤ ਈਮੇਲ ਫਾਰਮੈਟ + ਪਾਸਵਰਡ ਖੇਤਰ ਖਾਲੀ ਹੈ + ਪਾਸਵਰਡ ਘੱਟੋ ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ + ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ + ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਪਾਸਵਰਡ ਖੇਤਰ ਖਾਲੀ ਹੈ + ਉਪਯੋਗਕਰਤਾ ਨਾਮ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ + ਈਮੇਲ ਪਤਾ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ + + + ਪ੍ਰੋਜੈਕਟ ਮੌਜੂਦ ਹੈ. + ਇਸ ਨਾਮ ਨਾਲ ਇੱਕ ਪ੍ਰੋਜੈਕਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ. + ਓਵਰਰਾਈਟ ਪ੍ਰੋਜੈਕਟ + ਇੱਕ ਨਵਾਂ ਨਾਮ ਚੁਣੋ + + + ਬਿਨਾਂ ਸਿਰਲੇਖ ਵਾਲਾ ਗਾਣਾ + ਟਰੈਕ 1 + + + ਪਾਠ-ਬੋਲੀ ਇੰਜਣ ਇੰਸਟਾਲ ਨਹੀ! \n ਕੀ ਤੁਹਾਨੂੰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ + ਇਸ ਨੂੰ ਇੰਸਟਾਲ? + ਭਾਗ ਉਪਲਬਧ ਨਹੀਂ ਹੈ + ਬਦਕਿਸਮਤੀ ਨਾਲ ਇਹ ਪ੍ਰੋਜੈਕਟ ਤੁਹਾਡੀ ਡਿਵਾਈਸ \'ਤੇ ਕੰਮ ਨਹੀਂ ਕਰਦਾ. + ਹੇਠ ਦਿੱਤੇ ਭਾਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹਨ: \n \n + \u2022 ਵਾਈਬ੍ਰੇਸ਼ਨ ਹੈ \n + \u2022 ਐਕਸਲੇਸ਼ਨ ਸੂਚਕ ਹੈ \n + \u2022 ਭਾਵਨਾ ਸੂਚਕ ਹੈ \n + \u2022 ਕੰਪਾਸ, \n + \u2022 ਵਾਈਬ੍ਰੇਸ਼ਨ ਹੈ \n + \u2022 ਪਾਠ-ਟੂ-ਸਪੀਚ ਇੰਜਣ \n + \u2022 ਰੀਅਰ ਕੈਮਰਾ ਹੈ \n + \u2022 ਫੇਸ ਖੋਜ \n + \u2022 ਫੇਸ ਖੋਜ \n + \u2022 ਰੀਅਰ ਕੈਮਰਾ ਹੈ \n + \u2022 ਰੀਅਰ ਕੈਮਰਾ ਹੈ \n + \u2022 ਫ਼ਲੈਸ਼ ਹੈ \n + \u2022 ਅਣਜਾਣ ਸੰਖੇਪ \n + NFC ਉਪਲੱਬਧ ਨਹੀ + ਕਿਰਪਾ ਕਰਕੇ ਐਨਐਫਸੀ ਨੂੰ ਸਰਗਰਮ ਕਰੋ ਅਤੇ ਐਪ ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ ਵਾਪਸ ਦਬਾਓ. + ਉਸੇ ਵੇਲੇ \'ਤੇ NFC ਅਤੇ ਚਿਹਰੇ ਖੋਜ ਦਾ ਇਸਤੇਮਾਲ ਦੀ ਕਾਰਗੁਜ਼ਾਰੀ ਨੂੰ ਲੈ ਕੇ ਹੋ ਸਕਦਾ ਹੈ, + ਮੁੱਦੇ. + + + ਵਾਪਸ + ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰੋ + ਮੁੜ ਚਾਲੂ ਕਰੋ + ਧੁਰੇ \'ਤੇ + ਧੁਰੇ \'ਤੇ + ਵੱਧੋ / \n ਤਣਾਅ + ਝਲਕ + ਕਢਾਈ + + + ਨਵਾ ਸੁਨੇਹਾ + ਸੁਨੇਹਾ + ਸੁਨੇਹੇ ਸੰਪਾਦਿਤ ਕਰੋ + + + NFC ਟੈਗ ਦੀ ਸੂਚੀ ਸੋਧ + ਸਭ + + + ਵਰਗ + ਕਢਾਈ + ਗਤੀ + ਲੁੱਕਸ + ਕਲਮ + ਆਵਾਜ਼ + ਨਿਯੰਤਰਣ + ਘਟਨਾ + ਤੁਹਾਡੀਆਂ ਇੱਟਾਂ + ਡਾਟਾ + ਡੀਵਾਈਸ: + ਔਲ NXT + ਔਲ EV3 + AR.Drone 2.0 + ਜੰਪਿੰਗ ਸੁਮੋ + ਫਿਰੋ + ਅਰਦਿਨੋ + ਕਰੋਮਕਾਸਟ + ਰਸਬੇਰੀ ਪੋਰਟ ਪੋਰਟ + ਟੈਸਟਿੰਗ + + + ਲੇਬਲ ਸ਼ਾਮਲ ਕਰੋ + ਇੰਪੁੱਟ ਸ਼ਾਮਲ ਕਰੋ + ਇਸ ਇੱਟ ਲਈ ਇੰਪੁੱਟ ਸ਼ਾਮਲ ਕਰੋ: + ਇਸ ਇੱਟ ਲਈ ਲੇਬਲ ਸ਼ਾਮਲ ਕਰੋ: + ਇਨਪੁਟ ਦਾ ਨਾਮ + ਵੱਡਾ ਟੈਕਸਟ + ਇਨ੍ਹਾਂ ਲੇਬਲਾਂ ਵਾਲੀ ਇਕ ਇੱਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ. ਕਿਰਪਾ ਕਰਕੇ ਹੋਰ ਲੇਬਲ ਜਾਂ ਇਨਪੁਟਸ ਸ਼ਾਮਲ ਕਰੋ. + ਪ੍ਰਭਾਸ਼ਿਤ + ਜਿਵੇਂ + ਟੈਪ \"+\" ਆਪਣੇ ਹੀ ਨਵ ਇੱਟ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ. + ਰਿਪੋਰਟ + + + "'ਤੇ ਸਥਾਨ" + ਨਜ਼ਰ ਨਾਲ ਰੱਖੋ + "x:" + "y:" + "ਨੂੰ ਸੈੱਟ X" + "ਨੂੰ ਸੈੱਟ X" + "ਬਦਲੋ ਕਰੋ x" + "ਕੇ y ਬਦਲੋ" + ਵਾਪਸ ਜਾਓ + "ਰੋਟੇਸ਼ਨ ਸ਼ੈਲੀ ਸੈੱਟ ਕਰੋ" + ਸਿਰਫ ਖੱਬੇ-ਸੱਜੇ + ਚਾਰੇ ਪਾਸੇ + ਘੁੰਮਾਓ ਨਾ + + ਪਰਤ +ਪਰਤਾਂ + ਪਰਤ +ਪਰਤਾਂ + + ਸਾਹਮਣੇ ਜਾਓ + ਜੇ ਕਿਨਾਰੇ ਤੇ, ਉਛਾਲ + ਭੇਜੋ + + ਕਦਮ +ਕਦਮ + ਕਦਮ +ਕਦਮ + + ਖੱਬੇ ਪਾਸੇ ਮੁੜੋ + ਸੱਜੇ ਮੁੜੋ + ਦਿਸ਼ਾ ਵੱਲ ਪੁਆਇੰਟ ਕਰੋ + ਵੱਲ ਇਸ਼ਾਰਾ ਕਰੋ + ਗਲਾਈਡ + ਤੋਂ x: + ਜਾਓ + ਅਹਿਸਾਸ ਸਥਿਤੀ + ਬੇਤਰਤੀਬੇ ਸਥਿਤੀ + + + ਆਪਣੀ ਮੋਸ਼ਨ ਟਾਈਪ ਸੈੱਟ ਕਰੋ + ਮੂਵਿੰਗ ਅਤੇ ਗੰਭੀਰਤਾ ਦੇ ਅਧੀਨ ਉਛਾਲ + ਗੰਭੀਰਤਾ ਅਧੀਨ ਨਹੀਂ ਚੱਲ ਰਹੇ, ਪਰ ਦੂਸਰੇ ਤੁਹਾਨੂੰ ਗੁਰੂਤਾ ਦੇ ਹੇਠਾਂ ਉਤਾਰਦੇ ਹਨ + ਗਰੈਵਿਟੀ ਦੇ ਹੇਠਾਂ ਚਲਣਾ ਜਾਂ ਉਛਾਲਣਾ ਨਹੀਂ (ਡਿਫੌਲਟ) + "ਨੂੰ ਪੁੰਜ ਸੈੱਟ ਕਰੋ" + ਕਿਲੋਗ੍ਰਾਮ + "ਸਾਰੇ ਅਦਾਕਾਰਾਂ ਅਤੇ ਆਬਜੈਕਟਸ ਲਈ ਗੰਭੀਰਤਾ ਨਿਰਧਾਰਤ ਕਰੋ" + ਕਦਮ / ਸਕਿੰਟ² + "ਉੱਤੇ ਵੇਗ ਸੈੱਟ ਕਰੋ" + ਕਦਮ / ਸਕਿੰਟ + ਡਿਗਰੀ / ਸਕਿੰਟ + "Set friction to" + "Set bounce factor to" + "Spin left" + "Spin right" + + Switch to look + Switch to look with number + and wait + Set background + Set background and wait + Set background to number + When background changes to + Set size to + Change size by + Hide + Show + "Set transparency" + "Change transparency" + "Set brightness" + "Change brightness" + "Set color" + "Change color" + by + to + Clear graphic effects + Next look + Next background + Previous look + Previous background + Edit look + Edit background + Delete look + Delete background + Turn flashlight + on + off + Vibrate for + Ask + and store written answer in + What\'s your name? + "Enter your answer:" + Submit answer + Ask + and store spoken answer in + What\'s your name? + Paint new look + Paint new background + "name of new look" + Copy look and name it + name of copied look + Copy background and name it + + + Pen down + Pen up + Set pen size to + Set pen color to + Clear + Stamp + + + Start sound + Start sound and wait + Stop sound + Stop all sounds + Set volume to + Change volume by + Speak + Hello! + and wait + Start listening to voice and store spoken words in + Speech recognition isn\'t available. + Missing offline data + Offline speech recognition + for %s is missing or needs to be updated. Would you like to download or update it now? + Set listening language to + Set instrument to + Set tempo to + Change tempo by + Pause for + Play drum + beats + Play note + for + + + Stitch + Start running stitch with length + Start zigzag stitch with length + and width + Start triple stitch with length + Stop current stitch + Write embroidery data to file + embroidery.dst + Sew up + Set thread color to + + + Reset timer + Open + in browser + + When scene starts + When tapped + When + becomes true + Wait + Wait until + is true + When gamepad button + tapped + When NFC + Stop + this script + all scripts + other scripts of this actor or object + + "second" + "seconds" + + When you bounce off + any edge, actor, or object + When you receive + Broadcast + Broadcast and wait + Continue scene + Start scene + Note + Think + Say + for + Forever + For values from + For each value from + in + to + Repeat + Repeat until + When stage is tapped + Create clone of + yourself + When you start as a clone + Delete this clone + Assert + equals expected + Wait until all other scripts have stopped + "Single tap at" + "Touch at" + "for" + "Touch and slide" + "from x:" + Finish stage + Finish tests + Assert lists + Actual: + Expected: + assert + equals to expected item of + + For each item of + For each tuple of items of + + + stored in variable with the same name + stored in variables with the same names + + + %d list selected + %d lists selected + + + time + times + + End of loop + If + is true then + Else + End if + Set variable + Change variable + Write variable on device + Read variable from device + Write variable + to file + variable.txt + "Data successfully written to %1$s" + Read variable + from file + and + keep the file + delete the file + Write list on device + Read list from device + add comment here… + Hmmmm! + Hello! + "new message" + Add + to list + Delete all items from list + Delete item from list + at position + Insert + into list + at position + Replace item in list + at position + with + Send web request to + https://catrob.at/joke + and store answer in + Allow web access? + Be very careful before allowing access, since the + link may expose your personal information, such as your precise geographical location or any text + you have entered to malicious others or to the public. See our + <a href=%1s>wiki</a> for more information why this can + be extremely dangerous. + + Always allow web access? + By always allowing access, you will + not be asked again to confirm web addresses from this domain. + + If you want to revoke this permission + later, you can remove the entry from the list of trusted domains in + the settings of this app. + + Get image from + and use as current look + and use as current background + "Get image from %1$s returned HTTP error %2$s" + "Get image from %1$s could not retrieve a recognized image format" + Store column + of the + comma-separated values + into list + kitty,cute\npuppy,naughty\noctopus,intelligent + + + piano + electric piano + cello + flute + vibraphone + organ + guitar + electric guitar + bass + pizzicato + synth pad + choir + synth lead + wooden flute + trombone + saxophone + bassoon + clarinet + music box + steel drum + marimba + + + snare drum + bass drum + side stick + crash cymbal + open hi-hat + closed hi-hat + tambourine + hand clap + claves + wood block + cowbell + triangle + bongo + conga + cabasa + guiro + vibraslap + open cuica + + + My project + Variable + Scene (%1$d) + Script group + Message + List + Background + Clouds + Clouds1 + Clouds2 + Animal + Wings up + Wings down + Tweet1 + Tweet2 + + Needle + + Outer Loop + + Inner Loop + + Background + Clouds + Clouds1 + Clouds2 + Bird + Bird Wings up + Bird Wings down + Bird Wings up left + Bird Wings down left + Tweet1 + Tweet2 + direction + My first Chromecast project + + Text + X: + + + indoor with hull + indoor without hull + outdoor with hull + outdoor without hull + + 3 meters + 5 meters + 10 meters + 100 meters + + 200 mm/s + 700 mm/s + 1000 mm/s + 2000 mm/s + + 40 degrees/s + 100 degrees/s + 200 degrees/s + 350 degrees/s + + 5 degrees + 12 degrees + 20 degrees + 30 degrees + + %1$s notification channel + + + Preview image saved + Cancel project download + Canceled downloading/reconverting project + "Uploading" + "Look at" + Upload in progress + Upload successful + Uploaded project rejected + Retry + Open App store + "Downloading" + Download in progress + Download successful + "Open" + ਆਕਾਰ: + + + This app needs the requested permissions to function properly. E.g., the +Camera brick needs access to the device\'s camera, the \"location\" formula element needs access to the +device\'s geolocation sensor, and in order to import and export projects from and to the local memory, the app +needs read and write access to it. You can always change permissions through your device\'s settings. + + Something went wrong while uploading the project. + Something went wrong while downloading the project. + "Project %s already in queue." + "Your download could not be + started, seems there is a problem with our server." + Something went wrong while creating a new project. + Something went wrong while renaming the scene. + Something went wrong while loading the project. + Something went wrong while saving the preview image. + An unknown error occurred. Check your Internet connection. + The project is not compatible with this version of the app. + This app version is outdated. Update now? + You cannot upload a project with the name \"My first project\". + Please rename the project. + You cannot upload an unmodified example project. Please + change something and try again. + Something went wrong while adding this brick. + Something went wrong while copying this brick. + Renaming an incompatible project is not possible. + Something went wrong while sharing the embroidery file. + Something went wrong while writing the embroidery file. + Embroidery is missing. + Something went wrong. + Geolocation data is not available. + Something went wrong while saving the new description. + Something went wrong while saving the new notes + and credits. + WhatsApp not installed + This script can\'t be added to a Chromecast + project. + + + Can\'t enable Bluetooth, please try turning it off and on again. + Paired devices + New devices + Looking for devices… + Search Bluetooth devices + Select device: + Connecting to your device.\nPlease wait… + + Connection to device failed! + No unpaired devices found + No paired devices found + + + Set Arduino digital pin + Set Arduino PWM~ pin + to + + + Set Raspberry Pi pin + to + If Raspberry Pi pin + is true then + When Raspberry Pi pin + changes to + high + low + Set Raspberry Pi PWM pin + + + Raspberry Pi settings + GPIO Version + Error: Could not connect to %s : %d + + + Set NXT motor + to + speed + Turn NXT motor + by + Stop NXT motor + Play NXT tone + Duration + Frequency + ×100Hz + A + B + C + B+C + All + Sensor connected on port 1 + Sensor connected on port 2 + Sensor connected on port 3 + Sensor connected on port 4 + none + NXT touch sensor + NXT sound sensor + NXT light sensor + NXT light sensor active + NXT ultrasonic sensor + Sensor not found! + NXT sensor configuration + Disable info dialog + Project specific NXT settings are not shown when + opening a project. + The mapping of NXT sensors to ports is project + specific and can only be configured for opened projects. + The current project uses Lego Mindstorms NXT bricks or sensors. For + proper functionality please connect the sensors to the robot as follows + Port 1 + Port 2 + Port 3 + Port 4 + Do not show this message again. + Choose a port for connecting to %1$s. + EV3 sensor configuration + Project specific EV3 settings are not shown when + opening a project. + The mapping of EV3 sensors to ports is project + specific and can only be configured for opened projects. + The current project uses Lego Mindstorms EV3 bricks or sensors. For + proper functionality please connect the sensors to the robot as follows + Sensor connected on port 1 + Sensor connected on port 2 + Sensor connected on port 3 + Sensor connected on port 4 + none + EV3 touch sensor + EV3 infrared sensor + EV3 color sensor + EV3 color sensor ambient + Ev3 color sensor reflected + HiTechnic color sensor + NXT temperature sensor (°C) + NXT temperature sensor (°F) + NXT light sensor + NXT light sensor active + NXT sound sensor + NXT ultrasonic sensor + A + B + C + D + B+C + All + Play EV3 tone + for + Volume + % + Stop EV3 motor + Set EV3 motor + Turn EV3 motor + by + Set EV3 LED status + Off + Green + Red + Orange + Green flashing + Red flashing + Orange flashing + Green pulse + Red pulse + Orange pulse + + + Take off / land AR.Drone 2.0 + Play AR.Drone 2.0 flash animation + Flip AR.Drone 2.0 + Move AR.Drone 2.0 left + Move AR.Drone 2.0 right + Move AR.Drone 2.0 forward + Move AR.Drone 2.0 backward + Move AR.Drone 2.0 up + Move AR.Drone 2.0 down + Emergency AR.Drone 2.0 + Turn AR.Drone 2.0 right + Turn AR.Drone 2.0 left + Set config AR.Drone 2.0 + Switch AR.Drone 2.0 camera + Altitude limit + Vertical speed limit + Rotation speed limit + Tilt limit + with + power + + + Blink green red + Blink green + Blink red + Blink orange + Snake green red + Fire + Standard + Red + Green + Red snake + Blank + Right missile + Left missile + Double missile + Front left green others red + Front right green others red + Rear right green others red + Rear left green others red + Left green right red + Left red right green + Blink standard + + Move Jumping Sumo forward + Move Jumping Sumo backward + Animations Jumping Sumo + No Jumping Sumo sound + Jump Jumping Sumo long + Jump Jumping Sumo high + Turn Jumping Sumo left + Turn Jumping Sumo right + ਡਿਗਰੀ + Flip Jumping Sumo + Taking picture Jumping Sumo + + + ਆਵਾਜ਼ + + + Spin + Tab + Slowshake + Metronome + Ondulation + Spinjump + Spiral + Slalom + + Volume + Normal + Robot + Insect + Monster + + + + Stop Phiro motor + Move Phiro motor forward + Move Phiro motor backward + Speed + + If Phiro + is activated + + Play Phiro music\n + Duration + tone + seconds + + Set Phiro light + Red + Green + Blue + + + Do + Re + Mi + Fa + So + La + Ti + + + Left + Right + Both + + + Left + Right + Both + + + Front Left Sensor + Front Right Sensor + Side Left Sensor + Side Right Sensor + Bottom Left Sensor + Bottom Right Sensor + + red + green + blue + + + ਡਾਟਾ + true + false + . + Formula editor + Changes discarded! + Formula is not valid! + Define input value + Formula too long! + Properties of this actor or object + ( + ) + sine + (90) + cosine + (360) + tangent + (45) + natural logarithm + (2.718281828459) + decimal logarithm + (10) + pi + + color + square root + (4) + random value from to + (1,6) + absolute value + (1) + round + (1.6) + modulo + (3,2) + arcsine + (0.5) + arccosine + (0) + arctangent + (1) + arctangent2 + (-1, 0) + exponent + (1) + power + (2,3) + floor + (0.7) + ceiling + (0.3) + maximum of + (5,4) + minimum of + (7,2) + if then else + (false, 2, 3) + true + false + length + (\'hello world\') + letter + (1,\'hello world\') + join + (\'hello\',\' world\') + join + (\'hello\',\' world\',\'!\') + regular expression + (\' an? ([^ .]+)\',\'I am a panda.\') + Regular expression + assistant + Regular + expression assistant + More information + The keyword could not be found. + JSON extractor + arduino digital pin + arduino analog pin + raspberry pi pin + (3) + stage touch x + stage touch y + stage is touched + stage touch x + stage touch y + stage is touched + last stage touch index + number of current touches + index of current touch + + (1) + item + (1,*list name*) + contains + (*list name*,1) + item\'s index + (1,*list name*) + number of items + (*list name*) + touches actor or object + touches edge + touches finger + touches color + color touches color + color at x y + color equals color with % + tolerance + acceleration x + acceleration y + acceleration z + compass direction + latitude + longitude + location accuracy + altitude + user language + inclination x + inclination y + loudness + timer + year + month + day + weekday + hour + minute + second + drone battery status + drone emergency state + drone flying + drone initialized + drone usb active + drone usb remaining time + drone camera ready + drone record ready + drone camera recording + drone camera number of frames + NXT sensor 1 + NXT sensor 2 + NXT sensor 3 + NXT sensor 4 + EV3 sensor 1 + EV3 sensor 2 + EV3 sensor 3 + EV3 sensor 4 + NXT touch + NXT sound + NXT light + NXT light active + NXT ultrasonic + EV3 touch + EV3 infrared + EV3 color + EV3 ambient color + EV3 reflected color + EV3 hitechnic color + EV3 NXT temperature in °C + EV3 NXT temperature in °F + EV3 NXT light + EV3 NXT light active + EV3 NXT sound + EV3 NXT ultrasonic + gamepad A pressed + gamepad B pressed + gamepad up pressed + gamepad down pressed + gamepad left pressed + gamepad right pressed + phiro front left sensor + phiro front right sensor + phiro side left sensor + phiro side right sensor + phiro bottom left sensor + phiro bottom right sensor + nfc tag id + nfc tag message + position x + position y + transparency + brightness + size + direction + layer + x velocity + y velocity + angular velocity + look number + look name + background number + background name + distance to touch position + Compute + Properties + Functions + Logic + Sensors + Device sensors + Maths + Text + Lists + Logical (Boolean) operators and constants + Comparison operators + Look properties + Motion properties + Visual sensors + Date and time + Touch detection + Lego Mindstorms NXT + Lego Mindstorms EV3 + ਅਰਦਿਨੋ + ਫਿਰੋ + ਰਸਬੇਰੀ ਪੋਰਟ ਪੋਰਟ + Drone + NFC + ਕਰੋਮਕਾਸਟ + Abc + ≠ + < + > + and + or + not + ≥ + ≤ + = + × + + + - + ÷ + ^ + delete + color picker + toggle functions + New variable + New list + HTML extractor + Do you want to save your changes? + Save changes? + New text + Change text + Change regular + expression + current items + Make it a list + first face is visible + first face size + first face x position + first face y position + second face is visible + second face size + second face x position + second face y position + text from camera + number of text blocks + text block x from camera + text block y from camera + text block size from camera + text block from camera + text block language from camera + (1) + Formula editor + With the formula editor you can create mathematical and + logical formulas that you can use in your bricks.\n\nContinue by tapping “NEXT” or exit + with “SKIP”. + + Input field + Here you can see and edit your formula. + Keyboard + This is where you can create + your formula, just like on a calculator. + Compute + To show your formula\'s current result, you can + use \"Compute\". + Properties + This is a collection of values that describe the properties of your + current actor or object. Examples are the x- and y-coordinates, or the current speed. + Functions + Like a calculator, the formula editor offers + many mathematical functions.\nYou can find trigonometric functions such as \"sin\" and \"cos\", + a random number generator, and text and list functions. + Logic + Logic is used to compare values and combine logical formulas.\nTo + compare values you can use logical operations such as \">\" (greater than) or \"=\" (equals).\nTo combine + logical formulas you can use logical operations such as \"AND\", \"OR\" and \"NOT\". + Sensors + In \"Sensors\" you can find information that your + device records.\nFor example, the tilt of your device, or the loudness of your surroundings. + ਡਾਟਾ + Variables and lists that are used in your project can be found here. + \nYou can simply insert these in your formula, or add new ones. + listening language + Speech recognition + There was a problem with text detection. Some components may still be downloading in the + background. Please make sure you are connected to the internet and check back later. + flatten + (*list name*) + + + Show variable + Hide variable + at + size: + color: + aligned + centered + left + right + Pick color + Pick note + + + Turn camera + on + off + Use camera + front + rear + Something went wrong while trying to use the camera. + + There was a problem with face detection. Some components may still be downloading in the + background. Please make sure you are connected to the internet and check back later. + + + + A + B + up + down + left + right + Please connect to your Chromecast first + Your project uses Chromecast bricks and can\'t be started + locally + Cast to + Cast button + Ready to cast to + Chromecast features disabled. Please enable cast features in the settings. + Searching for Chromecast devices + .\nDon\'t see your device? Try turning your device\'s Wifi off + and on. + Connection timeout. Please try again. + Paused + + Delete? + Deleting a variable or list that is still in use can cause + errors. You can\'t undo this! + + Your project gets uploaded to the app\’s sharing site where others + can use and download it. You can also download your project as a standalone app. + Upload failed. Please check your internet connection and try + again! + Show project + + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + + + Got it + Enable to show hints + Show hints + All bricks are sorted in categories. Choose the category you are looking for. + To add a brick to your script, tap on the brick you want to use. + The script defines the behavior of your actor or object. To add bricks to the script, + tap the \"+\" symbol. + Here you can find the different appearances of your actor or object. To add a new look, + tap the \"+\" symbol. + Here you can add new sounds to your actor or object. Remember using a brick from the + sound category. + Your program consists of different actors and objects that can interact with each other. + To add a new actor or object, tap the \"+\" symbol. + + + ਸੰਕੇਤ ਦਿਖਾਓ? + ਸੰਕੇਤ ਤੁਹਾਨੂੰ ਮਦਦਗਾਰ ਜਾਣਕਾਰੀ ਪ੍ਰਦਾਨ ਕਰਦੇ ਹਨ + ਆਪਣਾ ਪਹਿਲਾ ਪ੍ਰੋਜੈਕਟ ਬਣਾਉਣ ਵੇਲੇ. ints n \ n ਸੰਕੇਤ ਦੀ ਵਿਜ਼ਿਬਿਲਟੀ ਨੂੰ. ਵਿੱਚ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ + ਸੈਟਿੰਗਜ਼. + ਓਹਲੇ + ਦਿਖਾਓ + + + + + Your device\'s language + + % + ㎐ + No internet connection. Make sure Wi-Fi or mobile + data is turned on. + Edit + Value + Recently used + ਨਜ਼ਰ ਨਾਲ ਰੱਖੋ + ਤੁਹਾਨੂੰ ਨਵਾਂ ਅਦਾਕਾਰ ਜਾਂ ਇਤਰਾਜ਼ \'ਤੇ ਰੱਖਣ ਲਈ ਕਿਹਾ ਜਾਵੇਗਾ + ਸਟੇਜ + + No variable selected + diff --git a/catroid/src/main/res/values-pl/strings.xml b/catroid/src/main/res/values-pl/strings.xml index 70aa86ea50b..1aa21feb612 100644 --- a/catroid/src/main/res/values-pl/strings.xml +++ b/catroid/src/main/res/values-pl/strings.xml @@ -104,6 +104,10 @@ Utworzono przez Szczegółowe informacje o tej aplikacji Więcej aplikacji w Google Play + Ups! Nie udało się otworzyć aplikacji Huawei AppGallery, + spróbuj ponownie później. + Google Play + Huawei App Gallery Tagi NFC @@ -648,14 +652,6 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Aby móc korzystać z aplikacji i innych plików wykonywalnych oferowanych przez projekt Catrobat, musisz wyrazić zgodę na nasze Warunki korzystania i usługi. Trzeba ściśle przestrzegać tych warunków podczas korzystania z naszych aplikacji i innych plików wykonywalnych. Proszę zobaczyć poniższy link, aby uzyskać precyzyjne sformułowania.\n Warunki użytkowania i korzystania z usługi - - Warunki użytkowania Pocket Code i korzystania z usługi - Za chwilę będziesz używać tej aplikacji razem z AR.Drone 2.0 firmy Parrot. Zdecydowanie zalecamy przestrzeganie Warunków użytkowania i usług zarówno Catrobat, jak i Parrot. - Nie przypominaj mi ponownie. - - - Za chwilę będziesz używać tej aplikacji razem z Jumping Sumo firmy Parrot. Zdecydowanie zalecamy przestrzeganie Warunków użytkowania i usług zarówno Catrobat, jak i Parrot. - Witaj! Aby korzystać z tej aplikacji, proszę zaakceptuj naszą @@ -767,7 +763,6 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Zamiana tekstu na głos nie zainstalowana!\nCzy chcesz ją zainstalować? Komponent niedostępny Niestety ten program nie działa na Twoim urządzeniu. Następujące składniki są niedostępne: \n\n - Inne urządzenie jest połączone z Jumping Sumo. Bądź pewien, że jesteś jedynym kontrolerem drona. \u2022 Wibracje\n \u2022 Czujnik przyspieszenia\n \u2022 Czujnik nachylenia\n @@ -777,7 +772,6 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych \u2022 Aparat z tyłu\n \u2022 Wykrywanie twarzy\n \u2022 Wykrywanie tekstu\n - \u2022 Skaczący Sumo\n \u2022 Aparat z przodu\n \u2022 Aparat\n \u2022 Latarka\n @@ -986,6 +980,7 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Zapisz dane haftu w pliku haft.dst Szyj + Ustaw kolor nici na Zresetuj stoper @@ -1078,7 +1073,7 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Jeżeli jest prawdą, to W przeciwnym razie - Zakończ jeśli + Zakończ jeżeli Ustaw zmienną Zmień zmienną Zapisz na urządzeniu zmienną @@ -1264,17 +1259,7 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Trwa pobieranie Pobieranie zakończone powodzeniem "Otwórz " - Uwaga! Bateria jest rozładowana. Aktualny stan %d Rozmiar: - Bateria jest słaba (automatyczne lądowanie). - Jedna lub więcej kamer nie odpowiada. - Czujnik ultradźwięków nie odpowiada. - AR.Drone 2.0 Kąty Eulera były zbyt wysokie. Silniki wyłączają się, aby zapobiec niebezpiecznym zachowaniom. - Jeden lub więcej silników został zatrzymany przez otoczenie. - Bateria jest zbyt słaba, aby startować ponownie. - Czujnik ultradźwiękowy nie może określić wysokości AR.Drone 2.0. - Brak oszacowania prędkości z dolnej kamery. - Tryb awaryjny Ta aplikacja potrzebuje wymaganych uprawnień do prawidłowego działania. Np. bloczek aparatu wymaga dostępu do aparatu urządzenia, element formuły „lokalizacja” wymaga dostępu do czujnika geolokalizacji urządzenia, a aby importować i eksportować projekty z i do pamięci lokalnej, aplikacja musi mieć dostęp do odczytu i zapisu. Zawsze możesz zmienić uprawnienia za pomocą ustawień urządzenia. @@ -1295,18 +1280,6 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Nie możesz przesłać niezmodyfikowanego przykładowego projektu. Zmień coś i spróbuj ponownie. Podczas dodawania tego bloku wystąpił błąd Podczas kopiowania tego bloku wystąpił błąd - Nie można znaleźć AR.Drone 2.0. - Połącz AR.Drone 2.0 z WiFi i spróbuj ponownie. - Niski poziom baterii drona AR.Drone 2.0: %d%% - Włóż naładowaną baterię i spróbuj ponownie. - Nie można uruchomić projektu Jumping Sumo na tym urządzeniu. - Nie można znaleźć Skaczącego Sumo - Połącz swoje wifi do Skaczącego Sumo i spróbuj ponownie. - Rozładowana bateria Jumping Sumo - Włóż naładowaną baterię i spróbuj ponownie. - Brak wsparcia Skaczącego Sumo - Brak wsparcia AR.Drone 2.0. - Nie można uruchomić projektu AR.Drone 2.0 na tym urządzeniu. Zmiana nazwy projektu niezgodnego z tą wersją nie jest możliwa. Coś poszło nie tak podczas udostępniania pliku haftu. Coś poszło nie tak podczas zapisywania pliku haftu. @@ -1865,7 +1838,7 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Wybierz notatkę - Obróć aparat + Aparat włącz wyłącz Użyj aparatu @@ -1904,6 +1877,15 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych ponownie! Pokaż projekt + + Projekt, który próbujesz przesłać już istnieje na + platformie społeczności w dokładnie tej samej formie. Proszę zmienić swój projekt, najlepiej przez + jego ulepszenie, przed przesłaniem zremixowanego projektu. + Prosimy o rozważenie dodania miłych słów do oryginalnego + autora w sekcji Kredyty na stronie społeczności lub w opcjach projektu. Proszę zanotować + że użytkownik otrzyma powiadomienie po pomyślnym przesłaniu. + Aby dowiedzieć się więcej o remiksach, odwiedź %1s. + Zrozumiałem Włącz podpowiedzi @@ -1915,6 +1897,14 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Tutaj można dodać nowe dźwięki do aktora lub obiektu. Pamiętaj o użyciu bloku z kategorii dźwięku. Program składa się z różnych aktorów i obiektów, które mogą oddziaływać na siebie nawzajem. Aby dodać nowego aktora lub obiekt naciśnij symbol \"+\". + + Pokazać wskazówki? + Wskazówki dostarczają Ci pomocnych informacji + podczas tworzenia pierwszego projektu.\n\nWidoczność wskazówek może zostać zmieniona w + ustawieniach. + UKRYJ + POKAŻ + @@ -1927,6 +1917,9 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Edytuj Wartość Ostatnio używane + Ręczne położenie + Zostaniesz poproszony o umieszczenie nowego aktora lub obiektu na + etapie. Nie wybrano zmiennej diff --git a/catroid/src/main/res/values-ps/strings.xml b/catroid/src/main/res/values-ps/strings.xml index 66bb54f3155..34e23e6ab3a 100644 --- a/catroid/src/main/res/values-ps/strings.xml +++ b/catroid/src/main/res/values-ps/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-pt-rBR/strings.xml b/catroid/src/main/res/values-pt-rBR/strings.xml index 9a1132ba3f1..17812b07c9a 100644 --- a/catroid/src/main/res/values-pt-rBR/strings.xml +++ b/catroid/src/main/res/values-pt-rBR/strings.xml @@ -28,7 +28,7 @@ Configurações Refazer Desfazer - Novo… + novo… editar… Confirmar Ignorar @@ -50,7 +50,7 @@ Selecionar tudo Desmarcar todos pular - Aviso + Atenção Erro Carregando… Por favor, aguarde @@ -104,6 +104,10 @@ Criado com Detalhes sobre este aplicativo Mais aplicativos na App Store + Whoops! Falhou ao abrir a Huawei AppGallery, + por favor, tente novamente mais tarde. + Google Play + Galeria de Aplicações Huawei Tags NFC @@ -114,7 +118,7 @@ Adicionar ou remover domínios confiáveis Editar domínios confiáveis Acessibilidade - Alterar a aparência do aplicativo + Alterar aparência do aplicativo Perfis de acessibilidade Perfis predefinidos Perfis @@ -137,15 +141,15 @@ Atraso ao arrastar e soltar Atraso ao arrastar e soltar bricks. Modo iniciante - Mostrar apenas funcionalidades simples. + Mostrar apenas recursos simples. Escolha um tipo de texto - Padrão + Regular Serifa - Fonte Disléxica + Disléxico Mudanças Aplicadas Padrão - Configurações Padrão - Meu Perfil + Configurações padrão + Meu perfil personalizado Minhas configurações pessoais Argus Alto contraste, ícones adicionais @@ -153,7 +157,7 @@ Texto grande, ícones grandes, espaço do elemento grande espaçamento, alto contraste Fenrir - Espaçamento grande dos elementos, atraso de arrastamento + Grande spaçamento entre elementos, atraso de arrastamento Tiro Modo iniciante @@ -174,7 +178,7 @@ Permitir que o aplicativo controle as placas da Arduino Extensão Embroidery Criar padrões para máquinas de costurar - Extensão do Chromecast + Extensão Chromecast Mostrar o botão cast e habilitar o cast de projetos Extensão de comunicação de campo próximo Permitir que o aplicativo use tags NFC em projetos @@ -295,17 +299,17 @@ Ocorreu um erro ao copiar o projeto Esse nome já está em uso, por favor, escolha outro. - Você coloca apenas espaços no campo de texto, por favor insira um texto + Você colocou apenas espaços no campo de texto, por favor insira um texto usando letras, números ou outros caracteres especiais. Por favor, insira um texto Não há itens nesta lista ainda. Por favor, adicione alguns primeiro. Nenhuma mesclagem é feita. Exatamente 2 projetos precisam ser selecionados para mesclar. - Pacote + Empacotar Desempacotar Copiar Apagar - Mudar nome + Renomear Converter Mesclar Você não pode desfazer isso! @@ -591,16 +595,6 @@ Para utilizar o Pocket Code e outros executáveis oferecidos pelo projeto Catrobat, é preciso aceitar nossos Termos de Uso e segui-los estritamente quando usar o Pocket Code e os outros executáveis. Por favor, visite o link abaixo para encontrar as definições precisas dos Termos de Uso. Termos de Uso e Serviço - - Termos de Uso e Serviço - Você está prestes a usar este app junto com o Parrot\'s - AR.Drone 2.0. Nós te lembramos fortemente de respeitar os Termos de Uso e Serviços do Parrot\'s e do Catrobat. - Não me lembre de novo. - - - Você está prestes a usar este app junto com o Parrot\'s - AR.Drone 2.0. Nós te lembramos fortemente de respeitar os Termos de Uso e Serviços do Parrot\'s e do Catrobat. - Bem-vindo! Para usar esta aplicação, por favor, aceite nossa @@ -718,8 +712,6 @@ Componente não disponível Infelizmente este projeto não funciona no seu dispositivo. Os seguintes componentes estão indisponíveis:\n\n - Outro dispositivo está conectado ao Jumping Sumo. Certifique-se de que você - está conectado ao drone. \u2022 Vibração\n \u2022 Sensor de aceleração\n \u2022 Sensor de inclinação\n @@ -729,7 +721,6 @@ \u2022 Câmera traseira\n \u2022 Detecção de rosto\n \u2022 Detecção de texto\n - \u2022 Sumo de Salto\n \u2022 Câmera frontal\n \u2022 Câmera\n \u2022 Lanterna\n @@ -935,6 +926,7 @@ Escrever dados da embroidery para um arquivo bordado.dst Costurar para cima + Definir a cor do tópico para Resetar cronômetro @@ -1203,18 +1195,7 @@ Download em progresso Download bem-sucedido "Abrir " - Atenção. A bateria está fraca. O status atual é %d Tamanho: - Bateria baixa (pouso automático). - Uma ou mais câmeras não estão a responder. - O sensor de ultrasound não está respondendo. - Os ângulos Euler do AR.Drone 2.0 ficaram muito altos. Motores desligados para evitar um comportamento - perigoso. - Um ou mais motores foram parados pelo ambiente. - A bateria está muito baixa para decolar novamente. - O sensor de Ultrasound não pode determinar a altitude AR.Drone 2.0. - Nenhuma estimativa de velocidade da câmera inferior. - Emergência Este app precisa das permissões solicitadas para funcionar corretamente. Ex. o bloco de câmera @@ -1240,18 +1221,6 @@ precisa de acesso de leitura e escrita a ele. Você sempre pode alterar as permi altere algo e tente novamente. Algo deu errado ao adicionar este bloco. Ocorreu um erro ao copiar este bloco - Não foi possível encontrar o AR.Drone 2.0. - Conecte seu wifi ao AR.Drone 2.0 e tente novamente. - AR.Drone 2.0 bateria baixa: %d%% - Insira uma bateria carregada e tente novamente. - Não é possível executar um projeto Sumo em Jumping no seu dispositivo. - Não foi possível encontrar Sumo de Salto - Conecte seu wifi ao Sumo de Salto e tente novamente. - Sumo de bateria fraca saltando - Insira uma bateria carregada e tente novamente. - Sem suporte a Saltar Sumo - Sem suporte ao AR.Drone 2.0. - Não é possível executar um projeto AR.Drone 2.0 no seu dispositivo. Não é possível renomear um projeto incompatível. Algo deu errado ao compartilhar o arquivo embroidery. Algo deu errado ao escrever o arquivo embroidery. @@ -1869,6 +1838,15 @@ precisa de acesso de leitura e escrita a ele. Você sempre pode alterar as permi novamente! Mostrar projeto + + Já existe um projeto exatamente igual a esse enviado + para a plataforma. Por favor altere seu projeto, de preferência + melhorando-o antes de fazer o upload do seu projeto remixado. + Por favor, considere adicionar algumas palavras gentis ao autor original + na seção de Créditos no site da comunidade ou nas opções do projeto. Por favor, note + que o usuário receberá uma notificação após o seu envio bem-sucedido. + Para saber mais sobre remixes, por favor, visite %1s. + Eu tenho que Ativar para mostrar dicas @@ -1884,6 +1862,14 @@ precisa de acesso de leitura e escrita a ele. Você sempre pode alterar as permi Seu programa consiste de diferentes atores e objetos que podem interagir uns com os outros. Para adicionar um novo ator ou objeto, toque no símbolo \"+\". + + Mostrar dicas? + As dicas lhe fornecem informações úteis + enquanto faz seu primeiro projeto.\n\nVisibilidade de dicas pode ser mudada no + configurações. + SEJA + PROJETE + @@ -1896,6 +1882,9 @@ precisa de acesso de leitura e escrita a ele. Você sempre pode alterar as permi Editar Valor Usados recentemente + Colocar visualmente + Você será solicitado a colocar o novo ator ou objeto sobre a + palco. Nenhuma variável selecionada diff --git a/catroid/src/main/res/values-pt/strings.xml b/catroid/src/main/res/values-pt/strings.xml index c5ed41705c3..0f56b50dba6 100644 --- a/catroid/src/main/res/values-pt/strings.xml +++ b/catroid/src/main/res/values-pt/strings.xml @@ -104,6 +104,10 @@ Criado com Detalhes sobre este app Avalie-nos no Google Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -592,17 +596,6 @@ and other services. Please see the link below for their precise formulation.\n Termos de Utilização e Serviço - - Termos de Utilização e Serviço - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Não me relembrar. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -719,8 +712,6 @@ Componente não está disponível Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Sensor de aceleração\n \u2022 Sensor de inclinação\n @@ -730,7 +721,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -936,6 +926,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1204,18 +1195,7 @@ Download em progresso Download concluído "Abrir " - Attention. Battery is low. Current status is %d Tamanho: - Bateria é baixa (pouso automático). - Uma ou mais câmera (s) não está respondendo. - Sensor de ultra-som não está respondendo. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - Um ou mais motores foi interrompido pelo ambiente. - Bateria é muito baixa para descolagem novamente. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - Nenhuma estimativa de velocidade de baixo virada para a câmera. - Emergência This app needs the requested permissions to function properly. E.g., the @@ -1241,18 +1221,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Ocorreu um erro ao adicionar este bloco Ocorreu um erro ao copiar este bloco - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insira uma bateria carregada e tente novamente. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insira uma bateria carregada e tente novamente. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1872,6 +1840,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1887,6 +1864,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1899,6 +1884,9 @@ needs read and write access to it. You can always change permissions through you Editar Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ro/strings.xml b/catroid/src/main/res/values-ro/strings.xml index f821873c34c..ff202ec9120 100644 --- a/catroid/src/main/res/values-ro/strings.xml +++ b/catroid/src/main/res/values-ro/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Magazin Play + Huawei App Gallery NFC tags @@ -633,17 +637,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -761,8 +754,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -772,7 +763,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -980,6 +970,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1253,18 +1244,7 @@ Descărcare în curs Descărcarea a avut loc cu succes "Deschide " - Attention. Battery is low. Current status is %d Mărimea proiectului: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1290,18 +1270,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. A apărut o eroare în timp ce ați adăugat această cărămidă A apărut o eroare în timpul copierii cărămizii - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Introduceţi un acumulator încărcat şi încercaţi din nou. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Introduceţi un acumulator încărcat şi încercaţi din nou. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1921,6 +1889,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1936,6 +1913,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1948,6 +1933,9 @@ needs read and write access to it. You can always change permissions through you Editează Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ru/strings.xml b/catroid/src/main/res/values-ru/strings.xml index 62ac1edc6a3..db9be8e8eed 100644 --- a/catroid/src/main/res/values-ru/strings.xml +++ b/catroid/src/main/res/values-ru/strings.xml @@ -104,6 +104,10 @@ Создан с помощью Сведения об этом приложении Больше приложений на Google Play + Упс! Не смог открыть Хуавэйскую Прикладную Галерею, + пожалуйста, попробуйте позже. + Google Play + App Gallery Huawei NFC тег @@ -668,17 +672,6 @@ и другие сервисы. Пожалуйста, перейдите по ссылке ниже для их детального рассмотрения.\n Условия пользования и обслуживания - - Условия использования и обслуживания - Вы собираетесь использовать это приложение вместе с Parrot - AR.Drone 2.0. Мы напоминаем вам о соблюдении Условий использования Parrot и Catrobat. - Не напоминать мне снова. - - - Вы собираетесь использовать это приложение вместе с - Parrot Jumping Sumo. Мы напоминаем вам о соблюдении - Условий использования Parrot и Catrobat. - Добро пожаловать! Чтобы использовать это приложение, пожалуйста, примите @@ -796,8 +789,6 @@ Компонент недоступен К сожалению, этот проект не работает на вашем устройстве. Следующие компоненты недоступны:\n\n - Другое устройство подключено к Jumping Sumo. Убедитесь, что - только вы подключены к дрону. Вибрация \u2022 Датчик ускорения\n \u2022 Датчик угла наклона\n @@ -807,7 +798,6 @@ \u2022 Задняя камера\n \u2022 Обнаружение лица\n \u2022 Определение текста\n - \u2022 Jumping Sumo\n \u2022 Фронтальная камера\n \u2022 Камера\n \u2022 Фонарик\n @@ -1017,6 +1007,7 @@ Записать данные вышивки в файл вышивка.dst Шить + Установите цвет резьбы в Сброс таймера @@ -1295,17 +1286,7 @@ Загрузка в процессе Загрузка завершена успешно "Открыть " - Внимание. Уровень заряда батареи мал. Текущий уровень заряда %d Размер программы: - Уровень батареи мал (автоматическая посадка). - Одна или несколько камер не отвечает. - Ультра-звуковой сенсор не отвечает. - Углы Эйлера AR.Drone 2.0 слишком велики. Выключение двигателей для предотвращения опасного поведения. - Один или более моторов были остановлены окружающей средой. - Заряд батареи слишком мал, чтобы взлететь вновь. - Ультразвуковой датчик не может определить высоту AR.Drone 2.0. - Невозможно оценить скорость нижней камерой. - Авария Это приложение нуждается в запрошенных разрешениях для правильного функционирования. @@ -1329,18 +1310,6 @@ изменить что-то и повторите попытку. При добавлении этого блока произошла ошибка При копировании этого блока произошла ошибка - Не удается найти AR.Drone 2.0. - Подключите свой wifi к AR.Drone 2.0 и попробуйте снова. - Уровень заряда батареи AR.Drone 2.0 мал:%d%% - Вставте заряженную батарею и повторите снова. - Мы не можем запустить проект Jumping Sumo на вашем устройстве. - Не удается найти Jumping Sumo - Подключите wifi к Jumping Sumo и попробуйте снова. - Низкий заряд батареи Jumping Sumo - Вставте заряженную батарею и повторите снова. - Jumping Sumo не поддерживается - AR.Drone 2.0 не поддерживается. - Мы не можем запустить проект AR.Drone 2.0 на вашем устройстве. Переименование несовместимого проекта невозможно. При сохранении файла что-то пошло не так. При сохранении файла что-то пошло не так. @@ -1956,6 +1925,15 @@ снова! Показать проект + + Проект, который вы пытаетесь загрузить, уже существует на + платформу сообщества в точно такой же форме. Пожалуйста, измените свой проект, в идеале + усовершенствовать его, перед загрузкой вашего ремиксованного проекта. + Пожалуйста, подумайте о том, чтобы добавить несколько добрых слов к оригиналу + Автор в разделе \"Кредиты\" на сайте сообщества или в вариантах проекта. Обратите внимание + что пользователь получит уведомление после успешной загрузки. + Чтобы узнать больше о ремиксах, посетите %1s. + Ясно Разрешить показывать подсказки @@ -1971,6 +1949,14 @@ Твоя программа состоит из разных актеров или объектов, которые могут взаимодействовать друг с другом. Чтобы добавить нового актера или объект нажми на \"+\". + + Показать подсказки? + Подсказки предоставят Вам полезную информацию + во время создания вашего первого проекта.\n\nVisibility подсказки могут быть изменены в разделе + настройки. + ШИРИНА + ПОКАЗЫВАТЬ + @@ -1982,6 +1968,9 @@ Редактирование Значение Недавно использованные + Поместить на глаз + Вам будет предложено поместить новый агент или объект на + Сцена. Переменная не выбрана diff --git a/catroid/src/main/res/values-sd/strings.xml b/catroid/src/main/res/values-sd/strings.xml index 2dfaa393a31..b9314d3c5a5 100644 --- a/catroid/src/main/res/values-sd/strings.xml +++ b/catroid/src/main/res/values-sd/strings.xml @@ -104,6 +104,10 @@ سان ٺاهيو ويو هن ايپ جي باري ۾ تفصيل گوگل پلي تي وڌيڪ ايپس + Whoops! Failed to open Huawei AppGallery, + please try again later. + گوگل پلي + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n استعمال ڪرڻ ۽ خدمتن جا شرط - - پاڪٽ ڪوڊ استعمال ڪرڻ ۽ خدمتن جا شرط - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you تصحيح Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-si/strings.xml b/catroid/src/main/res/values-si/strings.xml index 765ee84c7f8..dae778ee036 100644 --- a/catroid/src/main/res/values-si/strings.xml +++ b/catroid/src/main/res/values-si/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + ගූගල් ප්ලේ ස්ටෝර් + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sk/strings.xml b/catroid/src/main/res/values-sk/strings.xml index 8cc20256546..5bee6690d3e 100644 --- a/catroid/src/main/res/values-sk/strings.xml +++ b/catroid/src/main/res/values-sk/strings.xml @@ -104,6 +104,10 @@ Vytvorené s Detaily o tejto aplikácii Ďalšie aplikácie v Obchode Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -667,17 +671,6 @@ and other services. Please see the link below for their precise formulation.\n Podmienky používania a služieb - - Podmienky používania a služieb - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Znovu nepripomínať. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -794,8 +787,6 @@ Komponent nie je k dispozícii Unfortunately this project does not work on your device. The following components are unavailable:\n\n - K Jumping Sumo je pripojené iné zariadenie. Uistite sa, že - ste jediný operátor drony. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -805,7 +796,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -1015,6 +1005,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1293,18 +1284,7 @@ Prebieha sťahovanie Sťahovanie bolo úspešné "Otvoriť " - Attention. Battery is low. Current status is %d Veľkosť: - Batéria je vybitá (automatické pristávanie). - Jedna alebo viac kamier neodpovedá. - Ultrazvukový senzor nereaguje. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Batéria je príliš slabá pre ďalší vzlet. - Ultrazvukový senzor nedokáže určit výšku AR.Drone 2.0. - No speed estimation from bottom facing camera. - Pohotovosť This app needs the requested permissions to function properly. E.g., the @@ -1330,18 +1310,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1959,6 +1927,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1974,6 +1951,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1986,6 +1971,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sl/strings.xml b/catroid/src/main/res/values-sl/strings.xml index 3eb3e273b65..104fe09e2ab 100644 --- a/catroid/src/main/res/values-sl/strings.xml +++ b/catroid/src/main/res/values-sl/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -671,17 +675,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -799,8 +792,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -810,7 +801,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -1020,6 +1010,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1298,18 +1289,7 @@ Prenos se izvaja Prenos je uspel "Odpri " - Attention. Battery is low. Current status is %d Velikost: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1335,18 +1315,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Prišlo je do napake pri dodajanju tega bloka Prišlo je do napake pri kopiranju tega bloka - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Vstavite polne baterije in poskusite znova. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Vstavite polne baterije in poskusite znova. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1966,6 +1934,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1981,6 +1958,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1993,6 +1978,9 @@ needs read and write access to it. You can always change permissions through you Uredi Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sq/strings.xml b/catroid/src/main/res/values-sq/strings.xml index c99fc68f8fc..5e3760cecc0 100644 --- a/catroid/src/main/res/values-sq/strings.xml +++ b/catroid/src/main/res/values-sq/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Duke u shkarkuar Shkarkimi i suksesshëm "Hape" - Attention. Battery is low. Current status is %d Madhësia: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Modifiko Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sr-rCS/strings.xml b/catroid/src/main/res/values-sr-rCS/strings.xml index 3be3e30d58c..540fc74cf47 100644 --- a/catroid/src/main/res/values-sr-rCS/strings.xml +++ b/catroid/src/main/res/values-sr-rCS/strings.xml @@ -104,6 +104,10 @@ Napravljeno sa Detalji o ovoj app Više aplikacija na App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -633,17 +637,6 @@ i druge usluge. Molimo pogledajte vezu u nastavku za njihovu preciznu formulaciju.\n Uslovi korišćenja i usluge - - Uslovi korišćenja i usluge - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Ne podsetite me opet. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Dobrodošli! To use this app, please accept our @@ -761,8 +754,6 @@ Komponenta nije dostupna Nažalost, ovaj projekat ne funkcioniše na vašem uređaju. Sledeće komponente nisu dostupne: \n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibracija\n \u2022 Senzor ubrzanja\n \u2022 Senzor nagiba\n @@ -772,7 +763,6 @@ \u2022 Zadnja kamera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Prednja kamera\n \u2022 Camera\n \u2022 Flashlight\n @@ -980,6 +970,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1253,18 +1244,7 @@ Preuzimanje u toku Preuzimanje uspešno "Otvori" - Pažnja. Baterija je prazna. Trenutni status je %d Veličina: - Baterija je prazna (automatsko sletanje). - Jedna ili više kamera ne reaguje. - Ultrazvučni senzor ne reaguje. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - Okolina je zaustavila jedan ili više motora. - Baterija je preniska da bi se ponovo moglo poletiti. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - Nema procene brzine od kamere usmerene odozdo. - Hitno This app needs the requested permissions to function properly. E.g., the @@ -1290,18 +1270,6 @@ needs read and write access to it. You can always change permissions through you promenite nešto i pokušajte ponovo. Došlo je do greške tokom dodavanja ove kocke. Došlo je do greške tokom kopiranja ove kocke. - Nije moguće pronaći AR.Drone 2.0. - Povežite svoj wifi na AR.Drone 2.0 i pokušajte ponovo. - Baterija AR.Drone 2.0 slaba:%d%% - Umetnite napunjenu bateriju i pokušajte ponovo. - Ne možemo pokrenuti Jumping Sumo projekat na vašem uređaju. - Nije moguće pronaći Jumping Suno - Povežite svoj wifi na Jumping Sumo i pokušajte ponovo. - Jumping Sumo baterija prazna - Umetnite napunjenu bateriju i pokušajte ponovo. - Nema podrške za Jumping Sumo - Nema podrške za AR.Drone 2.0 - Ne možemo pokrenuti AR.Drone 2.0 projekat na vašem uređaju. Preimenovanje nekompatibilnog projekta nije moguće. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1921,6 +1889,15 @@ needs read and write access to it. You can always change permissions through you opet! Prikaži projekat + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Razumem Enable to show hints @@ -1936,6 +1913,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1948,6 +1933,9 @@ needs read and write access to it. You can always change permissions through you Izmeni Value Recently used + Postavite vizuelno + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sr-rSP/strings.xml b/catroid/src/main/res/values-sr-rSP/strings.xml index c11f736c46a..836880bf21d 100644 --- a/catroid/src/main/res/values-sr-rSP/strings.xml +++ b/catroid/src/main/res/values-sr-rSP/strings.xml @@ -104,6 +104,10 @@ Направљено помоћу Детаљи у овој апликацији Више апликација на App продавници + Whoops! Failed to open Huawei AppGallery, + please try again later. + Гугл продавница + Huawei App Gallery NFC tags @@ -623,17 +627,6 @@ and other services. Please see the link below for their precise formulation.\n Услови коришћења и услуге - - Услови коришћења и услуге - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Добродошли! Before you can start coding, please read and accept our Privacy @@ -751,8 +744,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -762,7 +753,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Face detection\n \u2022 Flashlight\n @@ -970,6 +960,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1243,17 +1234,7 @@ Преузимање у току Преузимање успешно "Отвори" - Пажња. Батерија је празна. Тренутни статус је %d Величина: - Батерија је празна (аутоматско слетање). - Једна или више камера не реагује. - Ултразвук сензор не реагује. - AR.Drone 2.0 Euler углови су превисоки. Мотори се искључују како би се спречило опасно понашање. - Околина је зауставила један или више мотора. - Батерија је превише празна за поновно узлетање. - Ултразвук сензор не може да одреди AR.Drone 2.0 висину. - Нема процене брзине од камере усмјерене одоздо. - Ванредна ситуација Овој апликацији су потребна тражена одобрења за правилно функционисање. Нпр @@ -1279,18 +1260,6 @@ change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1903,6 +1872,15 @@ again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1918,6 +1896,14 @@ Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1930,6 +1916,9 @@ Измени Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sv/strings.xml b/catroid/src/main/res/values-sv/strings.xml index e3369ff5824..76957104055 100644 --- a/catroid/src/main/res/values-sv/strings.xml +++ b/catroid/src/main/res/values-sv/strings.xml @@ -104,6 +104,10 @@ Skapad med Detaljer om denna app Fler appar i App Store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC-taggar @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Villkor för användning och tjänst - - Villkor för användning och tjänst - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Påminn mig inte igen. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Välkommen! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Kamera\n \u2022 Ficklampa\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Nedladdning pågår Nedladdning slutförd "Öppen " - Attention. Battery is low. Current status is %d storlek: - Battery is low (automatic landing). - En eller flera kameror svarar inte. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Nödläge This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Ett fel uppstod när du la till denna kloss Ett fel uppstod när du la till denna kloss - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - sätt in ett laddat batteri och försök igen. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - sätt in ett laddat batteri och försök igen. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Visa program + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Jag fattar Aktivera för att visa tips @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Redigera Value Recently used + Placera visuellt + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-sw/strings.xml b/catroid/src/main/res/values-sw/strings.xml index 8134e4c4f18..b8d0f6b6613 100644 --- a/catroid/src/main/res/values-sw/strings.xml +++ b/catroid/src/main/res/values-sw/strings.xml @@ -104,6 +104,10 @@ Kuundwa kwa Maelezo kuhusu programu hii Programu zaidi kwenye Google Play + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -591,17 +595,6 @@ and other services. Please see the link below for their precise formulation.\n Masharti ya matumizi na huduma - - Masharti ya matumizi na huduma - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Si Nikumbushe tena. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -718,8 +711,6 @@ Kijenzi hakipatikani Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 sensor ongeza kasi\n \u2022 mwelekeo sensor\n @@ -729,7 +720,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -935,6 +925,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1203,18 +1194,7 @@ Inaendelea kupakua Kupakua kumefaulu "Fungua " - Attention. Battery is low. Current status is %d Ukubwa: - Betri iko chini (kutua otomatiki). - Kamera moja au zaidi ni haziitiki. - Kihisio cha ultrasound hakiitikii. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - mota Moja au zaidi walisimamishwa na mazingira. - Betri iko chini sana kuchukua tena. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - Hakuna hesabu ya kasi kutoka chini inakabiliwa na kamera. - Dharura This app needs the requested permissions to function properly. E.g., the @@ -1240,18 +1220,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Kosa limetokea wakati wa kuongeza tofali hili. Kosa limetokea wakati wa kunakili tofali hili. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Chomeka betri iliyochagiwa na jaribu tena. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Chomeka betri iliyochagiwa na jaribu tena. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Haiwezekani kuita jina jipya wa mradi usiopatanifu. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1851,6 +1819,15 @@ needs read and write access to it. You can always change permissions through you again! Onyesha programu + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Nimeelewa Wezesha kuonyesha vidokezo @@ -1866,6 +1843,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1878,6 +1863,9 @@ needs read and write access to it. You can always change permissions through you Hariri Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ta/strings.xml b/catroid/src/main/res/values-ta/strings.xml index 4c3e783c2d0..aa60f867597 100644 --- a/catroid/src/main/res/values-ta/strings.xml +++ b/catroid/src/main/res/values-ta/strings.xml @@ -104,6 +104,10 @@ உருவாக்கம் இந்த பயன்பாட்டை பற்றி விவரம் ஆப் ஸ்டோரில் கூடுதல் பயன்பாடுகள் + Whoops! Failed to open Huawei AppGallery, + please try again later. + கூகுள் ப்ளே + Huawei App Gallery NFC tags @@ -585,15 +589,6 @@ எங்கள் பயன்பாட்டு விதிமுறைகள் மற்றும் சேவை விதிமுறைகளுக்கு உடன்பட வேண்டும். எங்கள் பயன்பாடுகளைப் பயன்படுத்தும் போது நீங்கள் இந்த விதிமுறைகளை கண்டிப்பாக பின்பற்ற வேண்டும் மற்றும் பிற சேவைகள். அவற்றின் துல்லியமான வடிவமைப்பிற்கு கீழே உள்ள இணைப்பைக் காண்க. \n பயன்பாட்டு விதிகள் மற்றும் சேவைகள் - - - பயன்பாட்டு விதிகள் மற்றும் சேவைகள் - Parrot\'s AR.Drone 2.0 உடன் சேர்ந்து இந்த பயன்பாட்டைப் பயன்படுத்த உள்ளீர்கள். கிளி மற்றும் கேட்ரோபாட்டின் பயன்பாட்டு விதிமுறைகள் மற்றும் சேவைகள் இரண்டையும் பின்பற்றுமாறு நாங்கள் உங்களுக்கு கடுமையாக நினைவூட்டுகிறோம். - மீண்டும் நினைவுபடுத்தாதே. - - - நீங்கள் இந்த பயன்பாட்டைப் பயன்படுத்தப் போகிறீர்கள் -கிளியின் ஜம்பிங் சுமோ. கிளி மற்றும் கேட்ரோபாட்டின் பயன்பாட்டு விதிமுறைகள் மற்றும் சேவைகள் இரண்டையும் பின்பற்றுமாறு நாங்கள் உங்களுக்கு கடுமையாக நினைவூட்டுகிறோம். வருக! @@ -712,7 +707,6 @@ கூறு கிடைக்கவில்லை துரதிர்ஷ்டவசமாக இந்த திட்டம் உங்கள் சாதனத்தில் இயங்காது. பின்வரும் கூறுகள் கிடைக்கவில்லை - மற்றொரு சாதனம் ஜம்பிங் சுமோவுடன் இணைக்கப்பட்டுள்ளது. ட்ரோனுடன் இணைக்கப்பட்டவர் நீங்கள்தான் என்பதை உறுதிப்படுத்திக் கொள்ளுங்கள். \u2022 Vibration\n முடுக்கம் சென்சார் சாய்வு சென்சார் @@ -722,7 +716,6 @@ பின் கேமரா \u2022 Face detection\n \u2022 Text detection\n - ஜம்பிங் சுமோ முன் கேமரா \u2022 Camera\n \u2022 Flashlight\n @@ -928,6 +921,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1196,18 +1190,7 @@ பதிவிறக்கம் செயலில் உள்ளது பதிவிறக்கம் வெற்றிகரமாக "திறந்த" - கவனம். பேட்டரி குறைவாக உள்ளது. தற்போதைய நிலை %d அளவு: - பேட்டரி குறைவாக உள்ளது (தானியங்கி தரையிறக்கம்). - ஒன்று அல்லது அதற்கு மேற்பட்ட கேமராக்கள் பதிலளிக்கவில்லை. - அல்ட்ராசவுண்ட் சென்சார் பதிலளிக்கவில்லை. - AR.Drone 2.0 யூலர் கோணங்கள் மிக அதிகமாக சென்றன. ஆபத்துகளைத் தடுக்க மோட்டார் நிறுத்தப்பட்டது - நடத்தை. - ஒன்று அல்லது அதற்கு மேற்பட்ட மோட்டார்கள் சூழலால் நிறுத்தப்பட்டன. - பேட்டரி மீண்டும் எடுக்க மிகவும் குறைவு. - அல்ட்ராசவுண்ட் சென்சார் AR.Drone 2.0 உயரத்தை தீர்மானிக்க முடியாது. - கீழே எதிர்கொள்ளும் கேமராவிலிருந்து வேக மதிப்பீடு இல்லை. - அவசரம் இந்த பயன்பாடு சரியாக செயல்பட கோரப்பட்ட அனுமதிகள் தேவை. எ.கா., கேமரா செங்கலுக்கு சாதனத்தின் கேமராவிற்கு அணுகல் தேவை, \"இருப்பிடம்\" சூத்திர உறுப்புக்கு சாதனத்தின் புவிஇருப்பிட சென்சார் அணுகல் தேவை, மேலும் உள்ளூர் நினைவகம் மற்றும் பயன்பாட்டிலிருந்து திட்டங்களை இறக்குமதி மற்றும் ஏற்றுமதி செய்ய. @@ -1227,18 +1210,6 @@ மாற்றப்படாத எடுத்துக்காட்டு திட்டத்தை நீங்கள் பதிவேற்ற முடியாது. ஏதாவது ஒன்றை மாற்றி மீண்டும் முயற்சிக்கவும். இந்த செங்கலைச் சேர்க்கும்போது ஏதோ தவறு ஏற்பட்டது. இந்த செங்கலை நகலெடுக்கும் போது ஏதோ தவறு ஏற்பட்டது. - AR.Drone 2.0 ஐக் கண்டுபிடிக்க முடியவில்லை. - உங்கள் வைஃபை AR.Drone 2.0 உடன் இணைத்து மீண்டும் முயற்சிக்கவும். - AR.Drone 2.0 பேட்டரி குறைவாக %d%% - சார்ஜ் செய்யப்பட்ட பேட்டரியைச் செருகவும், மீண்டும் முயற்சிக்கவும். - உங்கள் சாதனத்தில் ஜம்பிங் சுமோ திட்டத்தை எங்களால் இயக்க முடியாது. - ஜம்பிங் சுமோவைக் கண்டுபிடிக்க முடியவில்லை - உங்கள் வைஃபை ஜம்பிங் சுமோவுடன் இணைத்து மீண்டும் முயற்சிக்கவும். - ஜம்பிங் சுமோ பேட்டரி குறைவாக - சார்ஜ் செய்யப்பட்ட பேட்டரியைச் செருகவும், மீண்டும் முயற்சிக்கவும். - ஜம்பிங் சுமோ ஆதரவு இல்லை - AR.Drone 2.0 ஆதரவு இல்லை. - உங்கள் சாதனத்தில் AR.Drone 2.0 திட்டத்தை எங்களால் இயக்க முடியாது. பொருந்தாத திட்டத்தை மறுபெயரிடுவது சாத்தியமில்லை. எம்பிராய்டரி கோப்பைப் பகிரும்போது ஏதோ தவறு ஏற்பட்டது. Something went wrong while writing the embroidery file. @@ -1839,6 +1810,15 @@ பதிவேற்றம் தோல்வி. உங்களுடைய இணைப்பை சரி பார்த்து மீண்டும் முயற்சி செய்யவும்! திட்டத்தைக் காண்பிக்கவும் + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + புரிந்தது குறிப்புகளைக் காட்ட இயக்கவும் @@ -1850,6 +1830,14 @@ இங்கே நீங்கள் உங்கள் நடிகர் அல்லது பொருளுக்கு புதிய ஒலிகளைச் சேர்க்கலாம். ஒலி வகையிலிருந்து ஒரு செங்கலைப் பயன்படுத்துவதை நினைவில் கொள்க. உங்கள் நிரல் ஒருவருக்கொருவர் தொடர்பு கொள்ளக்கூடிய வெவ்வேறு நடிகர்கள் மற்றும் பொருள்களைக் கொண்டுள்ளது.    புதிய நடிகர் அல்லது பொருளைச் சேர்க்க, \"+\" சின்னத்தைத் தட்டவும். + + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW @@ -1863,6 +1851,9 @@ திருத்து Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-te/strings.xml b/catroid/src/main/res/values-te/strings.xml index 62856ff3a1f..068ec70bec0 100644 --- a/catroid/src/main/res/values-te/strings.xml +++ b/catroid/src/main/res/values-te/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + గూగ్లె ప్లే + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n ఉపయోగ నిబంధనలు మరియు సేవలు - - ఉపయోగ నిబంధనలు మరియు సేవలు - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-th/strings.xml b/catroid/src/main/res/values-th/strings.xml index 8264d456895..7b27b954d58 100644 --- a/catroid/src/main/res/values-th/strings.xml +++ b/catroid/src/main/res/values-th/strings.xml @@ -104,6 +104,10 @@ สร้างด้วย รายละเอียดเกี่ยวกับแอพนี้ แอพเพิ่มเติมใน App Store + อ๊ะ! ไม่สามารถเปิด Huawei AppGallery + กรุณาลองใหม่อีกครั้งในภายหลัง + Google Play + Huawei App Gallery แท็ก NFC @@ -543,16 +547,6 @@ ในการได้รับอนุญาตให้ใช้แอพและบริการอื่น ๆ ที่เสนอโดยโครงการ Catrobat คุณต้องยอมรับข้อกำหนดการใช้งานและบริการของเรา คุณต้องปฏิบัติตามข้อกำหนดเหล่านี้อย่างเคร่งครัดเมื่อใช้แอพและบริการอื่น ๆ ของเรา โปรดดูลิงก์ด้านล่างสำหรับสูตรที่แม่นยำ \n ข้อกำหนดการใช้งานและบริการ - - ข้อกำหนดการใช้งานและบริการ - คุณกำลังจะใช้แอพนี้ร่วมกับ AR.Drone 2.0 ของ Parrot เราขอเตือนอย่างยิ่งให้คุณปฏิบัติตามข้อกำหนดในการให้บริการทั้งของ Parrot และ Catrobat - ไม่ต้องเตือนฉันอีก - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - ยินดีต้อนรับ! ในการใช้แอพนี้โปรดยอมรับไฟล์ @@ -667,7 +661,6 @@ ติดตั้งหรือไม่ ไม่มีส่วนประกอบ น่าเสียดายที่โครงการนี้ใช้ไม่ได้กับอุปกรณ์ของคุณ ส่วนประกอบต่อไปนี้ไม่สามารถใช้งานได้: \ n\n - อุปกรณ์อื่นเชื่อมต่อกับ Jumping Sumo ตรวจสอบให้แน่ใจว่าคุณเป็นคนที่เชื่อมต่อกับโดรน \u2022 การสั่นสะเทือน \n \u2022 เซ็นเซอร์ความเร่ง \n \u2022 เซ็นเซอร์ความเอียง \ n @@ -677,7 +670,6 @@ \u2022 กล้องด้านหลัง \n \u2022 การตรวจจับใบหน้า \n \u2022 การตรวจจับข้อความ \n - \u2022 Jumping Sumo\n \u2022 กล้องด้านหน้า \n \u2022 กล้อง \n \u2022 ไฟแฟรช\n @@ -880,6 +872,7 @@ เขียนข้อมูลการปักลงในไฟล์ embroidery.dst เย็บ + ตั้งค่าสีเป็น รีเซ็ตเวลา @@ -1140,17 +1133,7 @@ ดาวน์โหลดอยู่ ดาวน์โหลดเสร็จเรียบร้อย "เปิด​ " - ความสนใจ แบตเตอรี่เหลือน้อย สถานะปัจจุบันคือ %d ขนาด: - แบตเตอรี่ต่ำ (ลงจอดอัตโนมัติ) - กล้องอย่างน้อยหนึ่งตัวไม่ตอบสนอง - เซ็นเซอร์อัลตร้าซาวด์ไม่ตอบสนอง - AR.Drone 2.0 มุมออยเลอร์สูงเกินไป มอเตอร์ปิดตัวลงเพื่อป้องกันพฤติกรรมที่เป็นอันตราย - มอเตอร์หนึ่งตัวหรือมากกว่าถูกหยุดโดยสภาพแวดล้อม - แบตเตอรี่เหลือน้อยเกินไปที่จะถอดอีกครั้ง - เซ็นเซอร์อัลตร้าซาวด์ไม่สามารถระบุความสูง AR.Drone 2.0 - ไม่มีการประมาณความเร็วจากกล้องหันหน้าไปทางด้านล่าง - ฉุกเฉิน แอปนี้ต้องการสิทธิ์ที่ร้องขอเพื่อให้สามารถทำงานได้ ตัวอย่างเช่นอิฐของกล้องต้องการการเข้าถึงกล้องของอุปกรณ์องค์ประกอบของสูตร \"ตำแหน่ง\" ต้องการการเข้าถึงเซ็นเซอร์ตำแหน่งทางภูมิศาสตร์ของอุปกรณ์และเพื่อนำเข้าและส่งออกโครงการจากและไปยังหน่วยความจำท้องถิ่นแอปนี้จำเป็นต้องมีสิทธิ์อ่านและเขียน. คุณสามารถเปลี่ยนการอนุญาตผ่านการตั้งค่าอุปกรณ์ของคุณ @@ -1170,18 +1153,6 @@ คุณไม่สามารถอัพโหลดโครงการตัวอย่างที่ไม่ได้แก้ไข โปรดเปลี่ยนบางสิ่งและลองอีกครั้ง เกิดข้อผิดพลาดขณะเพิ่มก้อนนี้ เกิดข้อผิดพลาดขณะคัดลอกก้อนนี้ - ไม่พบ AR.Drone 2.0 - เชื่อมต่อ wifi ของคุณกับ AR.Drone 2.0 แล้วลองอีกครั้ง - แบตเตอรี่ AR.Drone 2.0 ต่ำ:%d%% - ใส่ถ่านที่ช๊าทแล้วและลองใหม่อีกครั้ง - เราไม่สามารถเรียกใช้โครงการ Jumping Sumo บนอุปกรณ์ของคุณ - ไม่พบ Jumping Sumo - เชื่อมต่อ wifi ของคุณกับ Jumping Sumo แล้วลองอีกครั้ง - Jumping Sumo แบตเตอรี่ต่ำ - ใส่ถ่านที่ช๊าทแล้วและลองใหม่อีกครั้ง - ไม่มีการสนับสนุน Jumping Sumo - ไม่รองรับ AR.Drone 2.0 - เราไม่สามารถเรียกใช้โครงการ AR.Drone 2.0 บนอุปกรณ์ของคุณ ไม่สามารถเปลี่ยนชื่อโครงการที่เข้ากันไม่ได้ เกิดข้อผิดพลาดบางอย่างขณะแชร์ไฟล์การปัก เกิดข้อผิดพลาดขณะเขียนไฟล์ปัก @@ -1797,6 +1768,15 @@ again! แสดงโครงการ + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + เข้าใจแล้ว เปิดใช้งานเพื่อแสดงคำแนะนำ @@ -1808,6 +1788,14 @@ ที่นี่คุณสามารถเพิ่มเสียงใหม่ให้กับนักแสดงหรือวัตถุของคุณ จำไว้ว่าใช้อิฐจากหมวดเสียง โปรแกรมของคุณประกอบด้วยนักแสดงและวัตถุต่าง ๆ ที่สามารถโต้ตอบซึ่งกันและกันได้ หากต้องการเพิ่มนักแสดงหรือวัตถุใหม่ให้แตะสัญลักษณ์ \"+\" + + แสดงคำใบ้ + คำแนะนำให้ข้อมูลที่เป็นประโยชน์แก่คุณ + ในขณะที่สร้างโปรเจ็กต์แรกของคุณ \n \n ความสามารถในการมองเห็นของคำใบ้สามารถเปลี่ยนแปลงได้ในไฟล์ + การตั้งค่า + ซ่อน + แสดง + @@ -1819,6 +1807,9 @@ แก้ไข ค่า ใช้ล่าสุด + วางสายตา + คุณจะถูกขอให้วางนักแสดงใหม่หรือวัตถุในไฟล์ + เวที. ไม่ได้เลือกตัวแปร diff --git a/catroid/src/main/res/values-tl/strings.xml b/catroid/src/main/res/values-tl/strings.xml index 4aa256e560a..d1d03421ea9 100644 --- a/catroid/src/main/res/values-tl/strings.xml +++ b/catroid/src/main/res/values-tl/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-tr/strings.xml b/catroid/src/main/res/values-tr/strings.xml index efe17596f5f..a72c64204fe 100644 --- a/catroid/src/main/res/values-tr/strings.xml +++ b/catroid/src/main/res/values-tr/strings.xml @@ -104,6 +104,10 @@ Kullandığı oyun motoru Uygulama ile ilgili ayrıntılar Google Play\'de daha fazla uygulama + Eyvah! Huawei AppGallery açılamadı, + lütfen daha sonra tekrar deneyin. + Google Play + Huawei Uygulama Galerisi NFC etiketleri @@ -564,7 +568,7 @@ Uygulamayı Değerlendir - Bu uygulamayı beğendiyseniz, lütfen Google play\'de bizi değerlendirin. + Bu uygulamayı beğendiyseniz, lütfen Uygulama mağazasın\'da bizi değerlendirin. Desteğine ihtiyacımız var! Şimdi Sonra Asla @@ -574,14 +578,6 @@ Catrobat projesi tarafından sunulan uygulamaları ve diğer hizmetleri kullanmanıza izin verilmesi için Kullanım ve Hizmet Şartlarımızı kabul etmeniz gerekir. Uygulamalarımızı kullanırken bu şartlara kesinlikle uymanız gerekir. \n Kullanım Koşulları ve Hizmetleri - - Kullanım Koşulları ve Hizmetleri - Bu uygulamayı Parrot\'un AR.Drone 2.0 ile birlikte kullanmak üzeresiniz. Hem Parrot hem de Catrobat\'ın Kullanım ve Hizmet Koşullarına uymanızı şiddetle hatırlatırız. - Bir daha hatırlatma - - - Bu uygulamayı Parrot\'s Jumping Sumo ile birlikte kullanmak üzeresiniz. Hem Parrot hem de Catrobat\'ın Kullanım ve Hizmet Koşullarına uymanızı şiddetle hatırlatırız. - Hoşgeldiniz! Bu uygulamayı kullanmak için, lütfen önce kabul edin: @@ -693,8 +689,6 @@ Bu uygulamanın kaynak kodu esas olarak GNU AGPL v3 lisansı altında lisanslanm Metin Okuma motoru yüklü değil!\nYüklemek istiyor musunuz? Bileşen mevcut değil Maalesef bu proje cihazınızda çalışmıyor. Aşağıdaki bileşenler kullanılamaz: \n \n - Başka Bir Cihaz, Jumping Sumo\'ya bağlı. Emin olun, - Drone\'un tek denetleyicisi sizsiniz. \u2022 Titreşim\n \u2022 Hızlanma sensörü\n \u2022 Eğim sensörü\n @@ -704,7 +698,6 @@ Bu uygulamanın kaynak kodu esas olarak GNU AGPL v3 lisansı altında lisanslanm \u2022 Arka kamera\n \u2022 Yüz algılama\n \u2022 Metin algılama\n - \u2022 Zıplama Sumo\n \u2022 Ön kamera\n \u2022 Kamera\n \u2022 Fener\n @@ -908,6 +901,7 @@ Bu uygulamanın kaynak kodu esas olarak GNU AGPL v3 lisansı altında lisanslanm Nakış verilerini dosyaya yaz nakıs.dst Yukarı dik + İplik rengini şu değere ayarlayın Zamanlayıcıyı sıfırla @@ -1163,22 +1157,12 @@ bekleyin Yükleme Başarılı Yüklenen program rededildi Yeniden deneyin - Google play\'de aç + Uygulama mağazasını aç "İndiriliyor…" İndirme devam ediyor… İndirme başarılı oldu "Aç" - Dikkat! Pil zayıf! Mevcut durum %d Boyut: - Düşük pil (otomatik iniş). - Bir veya daha fazla kamera yanıt vermiyor. - Ultrason sensörü yanıt vermiyor. - AR.Drone 2.0 Euler açıları çok yükseldi. Tehlikeli davranışları önlemek için motorlar kapandı. - Bir veya daha fazla motor çevre tarafından durduruldu. - Pil, işimizi görmeyecek kadar düşük. - Ultrason sensörü AR.Drone 2.0 rakımını belirleyemez. - Alta bakan kameradan hız tahmini yok. - Acil durum Bu uygulamanın düzgün çalışması için istenen izinlere ihtiyacı var. Ör. Kamera tuğlasının cihazın kamerasına erişmesi gerekiyor, \"konum\" formül öğesinin cihazın coğrafi konum sensörü ve projeleri yerel bellekten ve yerel bellekten içe ve dışa aktarmak için uygulama okuma ve yazma erişimine ihtiyacı var. İzinleri her zaman cihazınızın ayarlarından değiştirebilirsiniz. @@ -1198,18 +1182,6 @@ bekleyin Değiştirilmemiş bir örnek proje yükleyemezsiniz. Lütfen bir şeyi değiştirip tekrar deneyin. Bu tuğla eklenirken bir hata oluştu Bu tuğla kopyalanırken bir hata oluştu - AR.Drone 2.0 bulunamadı. - Wifiniz ile AR.Drone 2.0\'ye bağlanmayı tekrar deneyin. - AR.Drone 2.0 düşük pil: %d%% - Yeni bir pil takın ve yeniden deneyin. - Cihazınızda bir Jumping Sumo projesi yürütemiyoruz. - Zıplayan Sumo bulunamıyor - Wifi\'nizi Jumping Sumo\'ya bağlayın ve tekrar deneyin. - Sumo bataryası zayıf atlama - Yeni bir pil takın ve yeniden deneyin. - Sumo atlama desteği yok - AR.Drone 2.0 desteği yok. - Cihazınızda bir AR.Drone 2.0 projesi çalıştıramıyoruz. Uyumsuz bir projenin yeniden adlandırılması mümkün değildir. Nakış dosyası paylaşılırken bir sorun oluştu. Nakış dosyası yazılırken bir şeyler ters gitti. @@ -1814,6 +1786,15 @@ bekleyin Yükleme başarısız. Lütfen internet bağlantınızı kontrol edin ve tekrar deneyin! Programı göster + + Yüklemeye çalıştığınız Remix projenizde + hiçbir değişiklik yapmadınız. Lütfen projenizi, ideal olarak şu şekilde Remixleyin: + Üzerine yeni şeyler ekleyin yada onu geliştirin. + Lütfen projenin asıl sahibine atıfta bulunmayı unutmayın, + topluluk sitesindeki \"Yapanlar\" bölümünde veya proje seçeneklerinde yazın. Lütfen aklınızda bulundurun + başarılı yüklemenizden sonra projebin asıl sahibi bir bildirim alacaktır. + Remixler hakkında bilgi almak için ziyaret edin %1s. + Anladım İpuçlarını görmek için etkinleştir @@ -1825,6 +1806,14 @@ bekleyin Burada aktörünüze veya nesnenize yeni sesler ekleyebilirsiniz. Ses kategorisinden bir tuğla kullanmayı unutmayın. Programınız birbiriyle etkileşim kurabilen farklı aktörlerden ve nesnelerden oluşur. Yeni bir oyuncu veya nesne eklemek için \"+\" simgesine dokunun. + + İpucları göster? + İpuçlar size yararlı bilgiler sağlar + ilk projenizi oluştururken.\n\nİpuçlarının görünürlüğü şuradan değiştirilebilir, + ayarlar. + GİZLE + GÖSTER + @@ -1837,6 +1826,9 @@ bekleyin Düzenle Değer En son kullanılan + Görsel olarak yerleştirin + Yeni objeyi ekranın herhangi bir yerine yerleştirmeniz + istenecek Değişken seçilmedi diff --git a/catroid/src/main/res/values-tw/strings.xml b/catroid/src/main/res/values-tw/strings.xml index 2278401c0e6..fb265d8116d 100644 --- a/catroid/src/main/res/values-tw/strings.xml +++ b/catroid/src/main/res/values-tw/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-uk/strings.xml b/catroid/src/main/res/values-uk/strings.xml index 95614f5b529..6088b404e47 100644 --- a/catroid/src/main/res/values-uk/strings.xml +++ b/catroid/src/main/res/values-uk/strings.xml @@ -99,6 +99,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -666,17 +670,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -794,8 +787,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -805,7 +796,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -1015,6 +1005,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1293,18 +1284,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1330,18 +1310,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1961,6 +1929,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1976,6 +1953,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1988,6 +1973,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-ur/strings.xml b/catroid/src/main/res/values-ur/strings.xml index 1195ab3239f..e625d9a5487 100644 --- a/catroid/src/main/res/values-ur/strings.xml +++ b/catroid/src/main/res/values-ur/strings.xml @@ -104,6 +104,10 @@ کے ساتھ پیدا اس ایپ کے بارے میں تفصیلات اپلی کیشن سٹور پر مزید ایپ + Whoops! Failed to open Huawei AppGallery, + please try again later. + گوگل پلے + Huawei App Gallery NFC tags @@ -582,17 +586,6 @@          ہماری استعمال کی شرائط اور سروس سے اتفاق کرنا ضروری ہے. آپ کو ہمارے اطلاقات کا استعمال کرتے وقت سختی سے ان شرائط پر عمل کرنا ہوگا          اور دیگر خدمات. برائے مہربانی ذیل میں دیئے گئے لنک کو ان کے عین مطابق تشکیل کے لئے ملاحظہ کریں. \ n استعمال اور خدمات کی شرائط - - - استعمال اور خدمات کی شرائط - آپ اس اپلی کیشن کو طوطا کے ساتھ ساتھ استعمال کرنا چاہتے ہیں -         AR.Done 2.0. ہم آپ کو پادری اور کیٹتوٹ دونوں کے استعمال اور خدمات کی شرائط دونوں کی طرف سے اطمینان دینے پر زور دیتے ہیں. - مجھے دوبارہ یاد نہ دلائیں۔ - - - آپ اس اپلی کیشن کے ساتھ مل کر استعمال کرتے ہیں -         طوطا کی جمپنگ سومو. ہم آپ کو پادری اور Catrobat کے استعمال کی شرائط اور دونوں دونوں کی طرف سے اطمینان دینے پر زور دیتے ہیں -         خدمات خوش آمدید @@ -709,8 +702,6 @@ اجزاء دستیاب نہیں بدقسمتی سے یہ منصوبہ آپ کے آلے پر کام نہیں کرتا.          مندرجہ ذیل اجزاء دستیاب نہیں ہیں: \ n \ n - ایک اور آلہ جمپنگ سومو سے منسلک ہے. یقینی بنائیں کہ آپ -         ڈرون سے منسلک ہے. \u2022 Vibration\n \ u2022 تیز رفتار سینسر n\ \ u2022 چڑھنے سینسر n\ @@ -720,7 +711,6 @@ \ u2022 ریئر کیمرے \ n \u2022 Face detection\n \u2022 Text detection\n - \ u2022 جموں سمو \ n \ u2022 فرنٹ کیمرے \ n \u2022 Camera\n \u2022 Flashlight\n @@ -926,6 +916,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1194,17 +1185,7 @@ ڈاؤن لوڈ جاری ہے ڈاؤن لوڈ کامیاب "کھولیں" - توجہ. بیٹری کم ہے. موجودہ حیثیت٪ %d ہے پیمائش: - بیٹری کم ہے (خودکار لینڈنگ). - ایک یا زیادہ کیمرے جواب نہیں دے رہے ہیں. - الٹراساؤنڈ سینسر جواب نہیں دے رہا ہے. - AR.Done 2.0 Euler زاویہ بہت زیادہ چلا گیا. خطرناک رویے کو روکنے کے لئے موٹر بند    - ایک یا زیادہ موٹرز ماحول کی طرف سے بند کر دیا گیا تھا. - دوبارہ دوبارہ لینے کے لئے بیٹری بہت کم ہے. - الٹراسوناؤن سینسر AR.Dron 2.0 اونچائی کا تعین نہیں کرسکتا ہے. - رفتار کا تخمینہ نہیں ہے, نیچے کا سامنا کیمرے سے. - ہنگامی یہ اپلی کیشن مناسب طریقے سے کام کرنے کے لئے مطلوبہ اجازت کی ضرورت ہے. مثال کے طور پر @@ -1230,18 +1211,6 @@          کچھ تبدیل کریں اور دوبارہ کوشش کریں. اس اینٹ کو شامل کرتے وقت کچھ غلط ہوا. اس اینٹ کاپی کرتے وقت کچھ غلط ہوگیا. - AR.Done 2.0 نہیں مل سکا. - اپنی وائی فائی AR.Dron 2.0 پر مربوط کریں اور دوبارہ کوشش کریں. - ڈرون 2.0 بیٹری کم: %d%% - ایک چارج شدہ بیٹری داخل کریں اور دوبارہ کوشش کریں. - ہم آپ کے آلے پر جمپنگ سومو منصوبے کو نہیں چل سکتے. - جمپنگ سومو کو نہیں ڈھونڈ سکتا - اپنی وائی فائی AR.Dron 2.0 پر مربوط کریں اور دوبارہ کوشش کریں. - جموں سمو بیٹری کم - ایک چارج شدہ بیٹری داخل کریں اور دوبارہ کوشش کریں. - جمپنگ سومو کی حمایت نہیں - ڈرون 2.0 کی حمایت نہیں ہے ۔ - ہم آپ کے آلہ پر AR.Done 2.0 پروجیکٹ نہیں چل سکتے. ناممکن منصوبے کا نام تبدیل کرنا ممکن نہیں ہے. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1850,6 +1819,15 @@ again! منصوبے دکھائیں + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + سمجھ گیا نشان دکھانے کے لئے فعال کریں @@ -1863,6 +1841,14 @@ یہاں آپ اپنے اداکار یا اعتراض میں نئی آواز شامل کر سکتے ہیں. صوتی قسم سے ایک اینٹوں کا استعمال کرتے ہوئے یاد رکھیں. آپ کا پروگرام مختلف اداکاروں اور اشیاء پر مشتمل ہوتا ہے جو ایک دوسرے کے ساتھ بات چیت کرسکتا ہے.          نیا اداکار یا اعتراض شامل کرنے کے لئے، \"+\" علامت کو ٹیپ کریں. + + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW @@ -1876,6 +1862,9 @@ تدوین کریں Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-uz/strings.xml b/catroid/src/main/res/values-uz/strings.xml index 0a6238557e7..88a7b1f5246 100644 --- a/catroid/src/main/res/values-uz/strings.xml +++ b/catroid/src/main/res/values-uz/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play + Huawei App Gallery NFC tags @@ -595,17 +599,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -723,8 +716,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -734,7 +725,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -940,6 +930,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1208,18 +1199,7 @@ Download in progress Download successful "Open" - Attention. Battery is low. Current status is %d Size: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1245,18 +1225,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Something went wrong while adding this brick. Something went wrong while copying this brick. - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Insert a charged battery and try again. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Insert a charged battery and try again. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1876,6 +1844,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1891,6 +1868,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1903,6 +1888,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-vi/strings.xml b/catroid/src/main/res/values-vi/strings.xml index 7700052800e..af3d3638206 100644 --- a/catroid/src/main/res/values-vi/strings.xml +++ b/catroid/src/main/res/values-vi/strings.xml @@ -104,6 +104,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + googlePlay + Huawei App Gallery NFC tags @@ -557,17 +561,6 @@ and other services. Please see the link below for their precise formulation.\n Terms of Use and Service - - Terms of Use and Service - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - Do not remind me again. - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -685,8 +678,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -696,7 +687,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -900,6 +890,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1163,18 +1154,7 @@ Tải xuống đang diễn ra Tải về thành công "Mở " - Attention. Battery is low. Current status is %d Kích cỡ: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1200,18 +1180,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. Có lỗi khi thêm gạch này Lỗi đã xảy ra trong khi sao chép gạch này - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - Thêm pin sạc và thử lại. - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - Thêm pin sạc và thử lại. - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1831,6 +1799,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1846,6 +1823,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1858,6 +1843,9 @@ needs read and write access to it. You can always change permissions through you Chỉnh sửa Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values-zh-rCN/strings.xml b/catroid/src/main/res/values-zh-rCN/strings.xml index 3441f60739e..f7b9f55b48b 100644 --- a/catroid/src/main/res/values-zh-rCN/strings.xml +++ b/catroid/src/main/res/values-zh-rCN/strings.xml @@ -104,6 +104,10 @@ 共同创建，与 关于此应用程序的详细信息 Google Play上的更多应用 + 糟糕! 打开华为应用商店失败。 + 请稍后再试。 + 谷歌 Play 商店 + 华为应用库 NFC 标签 @@ -545,14 +549,6 @@ 为了获权使用Catrobat 项目提供的应用程序和其他可执行文件，当您使用我们的应用程序和其他可执行文件时，您必须同意我们的使用和服务条款并严格遵循它们。请参阅下面的链接获取详细的条款 \n 使用与服务条例 - - 使用与服务条例 - 您即将使用此应用与 Parrot 的AR.无人机2.0。 我们强烈提醒您遵守Parrot和Catrobat的使用和服务条款。 - 不要再次提醒我。 - - - 您即将使用这个应用程序与Parrot Jumping Sumo。 我们强烈提醒您遵守Parrot和Catrobat的使用条款和服务。 - 欢迎! 要使用这个应用，请接受我们的应用 @@ -666,7 +662,6 @@ dash(-), 下划线 (_), 和 句号(.). 组件不可用 不幸此项目无法在您的设备上运行。 以下组件不可用:\n\n - 另一台设备连接到Jumping Sumo。当然, 你是无人机的唯一控制者。 \u2022 振动\n \u2022 加速度传感器\n \u2022 倾角传感器\n @@ -676,7 +671,6 @@ dash(-), 下划线 (_), 和 句号(.). \u2022 后置摄像头\n \u2022 人脸检测\n \u2022 文本检测\n - \u2022 Jumping Sumo\n \u2022 前置摄像头\n \u2022 相机\n \u2022 闪光灯\n @@ -879,6 +873,7 @@ dash(-), 下划线 (_), 和 句号(.). 将刺绣数据写入文件 刺绣.dst 上移 + 将线的颜色设置为 计时器归零 @@ -1142,17 +1137,7 @@ dash(-), 下划线 (_), 和 句号(.). Tải xuống đang diễn ra Tải về thành công "Mở " - 注意。电池电量低。当前状态是 %d Kích cỡ: - 电池电量太低 (自动着陆)。 - 一个或多个摄像头没有响应。 - 超声波传感器无响应 - AR.无人机2.0 Euler 角度过高。关闭引擎以防止危险行为。 - 一个或多个马达受环境影响停止。 - 电量过低，无法再次起飞。 - 超声波传感器无法确定AR 2.0无人机的高度。 - 底部摄像头无法估算出速度。 - 紧急情况 此应用需要所要求的权限才能正常工作。 @@ -1177,18 +1162,6 @@ dash(-), 下划线 (_), 和 句号(.). 更改某些内容，然后重试。 Có lỗi khi thêm gạch này Lỗi đã xảy ra trong khi sao chép gạch này - 找不到AR 2.0无人机 - 将AR 2.0无人机连接到您的无线网络，然后重试。 - AR2.0无人机电量低: %d%% - Thêm pin sạc và thử lại. - 我们无法在您的设备上运行Jumping Sumo项目。 - 找不到Jumping Sumo - 将您的Jumping Sumo连接到您的无线网络，然后重试。 - Jumping Sumo电量低 - Thêm pin sạc và thử lại. - 暂不支持Jumping Sumo - 暂不支持AR无人机2.0 - 我们无法在您的设备上运行AR2.0无人机项目。 重命名不兼容的程序是不可能的。 分享刺绣文件时出了错。 写刺绣文件时出了错。 @@ -1791,6 +1764,15 @@ dash(-), 下划线 (_), 和 句号(.). 上传失败. 请检查网络连接后重试. 显示程序 + + 你试图上传的项目已经存在于 + 社区平台上存在，而且形式完全相同。请改变你的项目，最好是通过 + 增强它，然后再上传你的重混项目。 + 请考虑在社区网站或项目选项中对原作者添加一些好话 + 请考虑在社区网站上的信用部分或项目选项中加入对原作者的赞誉。请注意 + 用户会在你成功上传后收到一个通知。 + 要了解更多关于翻唱的信息，请访问%1s。 + 明白了 启用提示显示 @@ -1803,6 +1785,14 @@ dash(-), 下划线 (_), 和 句号(.). 声音类别中的积木。 您的程序包含了可以彼此交互作用的不同对象。若要添加一个新对象，请点击\"+\"符号。 + + 显示暗示？ + 提示为您提供有用的信息 + 当您制作第一个项目时，提示为您提供有用的信息。\n\n提示的可见性可以在设置中改变。 + 设置中改变 + 隐蔽 + 显示 + @@ -1815,6 +1805,9 @@ dash(-), 下划线 (_), 和 句号(.). 编辑 值 最近使用的 + 视觉设置 + 你将被要求把新的演员或物体放在舞台上。 + 舞台上。 未选择变量 diff --git a/catroid/src/main/res/values-zh-rTW/strings.xml b/catroid/src/main/res/values-zh-rTW/strings.xml index 2a0c0198f20..2d3c604d4c5 100644 --- a/catroid/src/main/res/values-zh-rTW/strings.xml +++ b/catroid/src/main/res/values-zh-rTW/strings.xml @@ -101,6 +101,10 @@ 建立者 APP詳情 在App store的作品 + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play商店 + Huawei App Gallery NFC 標籤 @@ -554,17 +558,6 @@ and other services. Please see the link below for their precise formulation.\n 使用與服務條款 - - 使用與服務條款 - You are about to use this app together with Parrot\'s - AR.Drone 2.0. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and Services. - 不要再次提醒我。 - - - You are about to use this app together with - Parrot\'s Jumping Sumo. We strongly remind you to abide by both Parrot\'s and Catrobat\'s Terms of Use and - Services. - Welcome! To use this app, please accept our @@ -682,8 +675,6 @@ Component not available Unfortunately this project does not work on your device. The following components are unavailable:\n\n - Another device is connected to the Jumping Sumo. Make sure you - are the one connected to the drone. \u2022 Vibration\n \u2022 Acceleration sensor\n \u2022 Inclination sensor\n @@ -693,7 +684,6 @@ \u2022 Rear camera\n \u2022 Face detection\n \u2022 Text detection\n - \u2022 Jumping Sumo\n \u2022 Front camera\n \u2022 Camera\n \u2022 Flashlight\n @@ -897,6 +887,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to Reset timer @@ -1160,18 +1151,7 @@ 下載進行中 下載成功 "開啟 " - Attention. Battery is low. Current status is %d 大小: - Battery is low (automatic landing). - One or more cameras are not responding. - Ultrasound sensor is not responding. - AR.Drone 2.0 Euler angles went too high. Motors shut down to prevent dangerous - behavior. - One or more motors were stopped by environment. - Battery is too low to take off again. - Ultrasound sensor can\'t determine AR.Drone 2.0 altitude. - No speed estimation from bottom facing camera. - Emergency This app needs the requested permissions to function properly. E.g., the @@ -1197,18 +1177,6 @@ needs read and write access to it. You can always change permissions through you change something and try again. 新增這個程式塊時出錯。 複製這個程式塊時出錯。 - Cannot find AR.Drone 2.0. - Connect your wifi to the AR.Drone 2.0 and try again. - AR.Drone 2.0 battery low: %d%% - 插入已充好電的電池然後重試。 - We cannot run a Jumping Sumo project on your device. - Cannot find Jumping Sumo - Connect your wifi to the Jumping Sumo and try again. - Jumping Sumo battery low - 插入已充好電的電池然後重試。 - No Jumping Sumo support - No AR.Drone 2.0 support. - We cannot run an AR.Drone 2.0 project on your device. Renaming an incompatible project is not possible. Something went wrong while sharing the embroidery file. Something went wrong while writing the embroidery file. @@ -1827,6 +1795,15 @@ needs read and write access to it. You can always change permissions through you again! Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + Got it Enable to show hints @@ -1842,6 +1819,14 @@ needs read and write access to it. You can always change permissions through you Your program consists of different actors and objects that can interact with each other. To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + @@ -1854,6 +1839,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/main/res/values/colors.xml b/catroid/src/main/res/values/colors.xml index b5402b5897a..1f66c9f5b88 100644 --- a/catroid/src/main/res/values/colors.xml +++ b/catroid/src/main/res/values/colors.xml @@ -39,6 +39,7 @@ #04222C #00475E + #00ACC1 #00475E #4D7F8F diff --git a/catroid/src/main/res/values/strings.xml b/catroid/src/main/res/values/strings.xml index 36440258095..339690d6198 100644 --- a/catroid/src/main/res/values/strings.xml +++ b/catroid/src/main/res/values/strings.xml @@ -128,6 +128,10 @@ Created with Details about this app More apps on App store + Whoops! Failed to open Huawei AppGallery, + please try again later. + Google Play Store + Huawei App Gallery NFC tags @@ -1046,6 +1050,7 @@ Write embroidery data to file embroidery.dst Sew up + Set thread color to @@ -2041,6 +2046,16 @@ needs read and write access to it. You can always change permissions through you Show project + + The project you are trying to upload already exists on + the community platform in exactly the same form. Please change your project, ideally by + enhancing it, before uploading your remixed project. + Please consider adding some kind words towards the original + author in the Credits section on the community site or in the project options. Please note + that the user will get a notification after your successful upload. + To learn more about remixes, please visit %1s. + + Got it Enable to show hints @@ -2057,6 +2072,15 @@ needs read and write access to it. You can always change permissions through you To add a new actor or object, tap the \"+\" symbol. + + Show hints? + Hints provide you with helpful information + while making your first project.\n\nVisibility of hints can be changed in the + settings. + HIDE + SHOW + + + @@ -2076,6 +2100,9 @@ needs read and write access to it. You can always change permissions through you Edit Value Recently used + Place visually + You will be asked to place the new actor or object on the + stage. No variable selected diff --git a/catroid/src/test/java/org/catrobat/catroid/test/stage/EmbroideryActorTest.java b/catroid/src/test/java/org/catrobat/catroid/test/stage/EmbroideryActorTest.java index 3790b587c2c..ba9b9c983d3 100644 --- a/catroid/src/test/java/org/catrobat/catroid/test/stage/EmbroideryActorTest.java +++ b/catroid/src/test/java/org/catrobat/catroid/test/stage/EmbroideryActorTest.java @@ -23,11 +23,11 @@ package org.catrobat.catroid.test.stage; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.utils.GdxNativesLoader; -import org.catrobat.catroid.content.Look; import org.catrobat.catroid.content.Sprite; import org.catrobat.catroid.embroidery.DSTPatternManager; import org.catrobat.catroid.embroidery.DSTStitchCommand; @@ -57,8 +57,7 @@ public class EmbroideryActorTest { public void setUp() throws Exception { PowerMockito.mockStatic(GdxNativesLoader.class); - sprite = Mockito.mock(Sprite.class); - sprite.look = Mockito.mock(Look.class); + sprite = new Sprite(); batch = Mockito.mock(Batch.class); StageActivity.stageListener = Mockito.mock(StageListener.class); StageActivity.stageListener.embroideryPatternManager = new DSTPatternManager(); @@ -77,15 +76,8 @@ public void testDrawLine() { float startY = 0.0f; float endX = 60.0f; float endY = 0.0f; - StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(startX, - startY, 1, sprite)); - StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(endX, - endY, 1, sprite)); - - EmbroideryActor embroideryActor = new EmbroideryActor(1.f, - StageActivity.stageListener.embroideryPatternManager, renderer); - embroideryActor.draw(batch, 1.f); + EmbroideryActor embroideryActor = setUpEmbroideryPatternManager(startX, startY, endX, endY); verify(renderer, times(1)).rectLine(startX, startY, endX, endY, embroideryActor.getStitchSize()); } @@ -96,18 +88,54 @@ public void testDrawLineWithCircles() { float startY = 0.0f; float endX = 30.0f; float endY = 0.0f; + + EmbroideryActor embroideryActor = setUpEmbroideryPatternManager(startX, startY, endX, endY); + + verify(renderer, times(1)).circle(startX, startY, embroideryActor.getStitchSize()); + verify(renderer, times(1)).rectLine(startX, startY, endX, endY, + embroideryActor.getStitchSize()); + verify(renderer, times(1)).circle(endX, endY, embroideryActor.getStitchSize()); + } + + @Test + public void testThreadColorStitchesOneColor() { + float startX = 0.0f; + float startY = 0.0f; + float endX = 30.0f; + float endY = 0.0f; + sprite.setEmbroideryThreadColor(Color.ORANGE); + setUpEmbroideryPatternManager(startX, startY, endX, endY); + verify(renderer, times(3)).setColor(Color.ORANGE); + } + + @Test + public void testThreadColorStitchesTwoColors() { + float startX = 0.0f; + float startY = 0.0f; + float endX = 30.0f; + float endY = 0.0f; + sprite.setEmbroideryThreadColor(Color.ORANGE); + setUpEmbroideryPatternManager(startX, startY, endX, endY); + verify(renderer, times(3)).setColor(Color.ORANGE); + startX = 30.0f; + startY = 0.0f; + endX = 40.0f; + endY = 0.0f; + sprite.setEmbroideryThreadColor(Color.RED); + setUpEmbroideryPatternManager(startX, startY, endX, endY); + verify(renderer, times(1)).setColor(Color.RED); + } + + public EmbroideryActor setUpEmbroideryPatternManager(float startX, float startY, float endX, float endY) { StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(startX, - startY, 1, sprite)); + startY, 1, sprite, sprite.getEmbroideryThreadColor())); StageActivity.stageListener.embroideryPatternManager.addStitchCommand(new DSTStitchCommand(endX, - endY, 1, sprite)); + endY, 1, sprite, sprite.getEmbroideryThreadColor())); EmbroideryActor embroideryActor = new EmbroideryActor(1.f, StageActivity.stageListener.embroideryPatternManager, renderer); embroideryActor.draw(batch, 1.f); - verify(renderer, times(1)).circle(startX, startY, embroideryActor.getStitchSize()); - verify(renderer, times(1)).rectLine(startX, startY, endX, endY, - embroideryActor.getStitchSize()); - verify(renderer, times(1)).circle(endX, endY, embroideryActor.getStitchSize()); + return embroideryActor; } }