diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerAuthenticationTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerAuthenticationTest.kt index 8d2f81019f9..25ed3e69125 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerAuthenticationTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerAuthenticationTest.kt @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2022 The Catrobat Team + * Copyright (C) 2010-2023 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -162,7 +162,7 @@ class CatroidWebServerAuthenticationTest : KoinTest { @Test fun testRegistrationOk() { val token = sharedPreferences.getString(Constants.TOKEN, Constants.NO_TOKEN) - val response = webServer.register("Bearer $token", RegisterUser(true, newEmail, newUserName, password)).execute() + val response = webServer.register(RegisterUser(true, newEmail, newUserName, password)).execute() val responseBody = response.body() assertNotNull(responseBody) @@ -176,7 +176,7 @@ class CatroidWebServerAuthenticationTest : KoinTest { @Test fun testRegisterWithNewUserButExistingEmail() { val token = sharedPreferences.getString(Constants.TOKEN, Constants.NO_TOKEN) - val response = webServer.register("Bearer $token", RegisterUser(true, email, newUserName, password)).execute() + val response = webServer.register(RegisterUser(true, email, newUserName, password)).execute() assertEquals(response.code(), SERVER_RESPONSE_REGISTER_UNPROCESSABLE_ENTITY) @@ -188,7 +188,7 @@ class CatroidWebServerAuthenticationTest : KoinTest { @Test fun testRegisterWithExistingUserButNewEmail() { val token = sharedPreferences.getString(Constants.TOKEN, Constants.NO_TOKEN) - val response = webServer.register("Bearer $token", RegisterUser(true, newEmail, username, password)).execute() + val response = webServer.register(RegisterUser(true, newEmail, username, password)).execute() assertEquals(response.code(), SERVER_RESPONSE_REGISTER_UNPROCESSABLE_ENTITY) @@ -200,7 +200,7 @@ class CatroidWebServerAuthenticationTest : KoinTest { @Test fun testRegisterAndLogin() { val token = sharedPreferences.getString(Constants.TOKEN, Constants.NO_TOKEN) - val registrationResponse = webServer.register("Bearer $token", RegisterUser(true, newEmail, newUserName, password)).execute() + val registrationResponse = webServer.register(RegisterUser(true, newEmail, newUserName, password)).execute() val loginResponse = webServer.login("Bearer $token", LoginUser(newUserName, password)).execute() diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerProjectUploadTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerProjectUploadTest.kt index 98f877cd7c8..d72bc936382 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerProjectUploadTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/retrofittesting/CatroidWebServerProjectUploadTest.kt @@ -97,7 +97,7 @@ class CatroidWebServerProjectUploadTest : KoinTest { newEmail = "$newUserName@api.at" val response = - webServer.register("", RegisterUser(true, newEmail, newUserName, PASSWORD)).execute() + webServer.register(RegisterUser(true, newEmail, newUserName, PASSWORD)).execute() val responseBody = response.body() assertNotNull(responseBody) assertNotNull(responseBody!!.token) @@ -123,7 +123,7 @@ class CatroidWebServerProjectUploadTest : KoinTest { val projectZip = ProjectZipper.zipProjectToArchive( File(project?.directory!!.absolutePath), - File(Constants.CACHE_DIR, "upload${Constants.CATROBAT_EXTENSION}") + File(Constants.CACHE_DIRECTORY, "upload${Constants.CATROBAT_EXTENSION}") ) assertNotNull(projectZip!!) @@ -155,7 +155,7 @@ class CatroidWebServerProjectUploadTest : KoinTest { val projectZip = ProjectZipper.zipProjectToArchive( File(project?.directory!!.absolutePath), - File(Constants.CACHE_DIR, "upload${Constants.CATROBAT_EXTENSION}") + File(Constants.CACHE_DIRECTORY, "upload${Constants.CATROBAT_EXTENSION}") ) assertNotNull(projectZip!!) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.java deleted file mode 100644 index 180ac7e9866..00000000000 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * 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.activity; - -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.preference.PreferenceManager; - -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.ui.ProjectUploadActivity; -import org.catrobat.catroid.ui.controller.ProjectUploadController; -import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule; -import org.jetbrains.annotations.NotNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.platform.app.InstrumentationRegistry; - -import static org.catrobat.catroid.common.Constants.UPLOAD_RESULT_RECEIVER_RESULT_CODE; -import static org.catrobat.catroid.io.asynctask.ProjectSaverKt.saveProjectSerial; -import static org.catrobat.catroid.ui.ProjectUploadActivityKt.NUMBER_OF_UPLOADED_PROJECTS; -import static org.catrobat.catroid.ui.ProjectUploadActivityKt.PROJECT_DIR; -import static org.mockito.Mockito.spy; - -import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.action.ViewActions.click; -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; - -@RunWith(AndroidJUnit4.class) -public class ProjectUploadDialogTest { - private Bundle bundle; - private Project project; - private SharedPreferences sharedPreferences; - private static final String PROJECT_NAME = ProjectUploadDialogTest.class.getSimpleName(); - - @Rule - public BaseActivityTestRule activityTestRule = - new BaseActivityTestRule<>(ProjectUploadTestActivity.class, false, false); - - @Before - public void setUp() throws Exception { - this.sharedPreferences = - PreferenceManager.getDefaultSharedPreferences(ApplicationProvider.getApplicationContext()); - this.bundle = new Bundle(); - - this.project = new Project(ApplicationProvider.getApplicationContext(), - PROJECT_NAME, false); - Scene firstScene = new Scene("scene", project); - ProjectManager.getInstance().setCurrentProject(project); - Sprite firstSprite = new Sprite("firstSprite"); - Script firstScript = new StartScript(); - firstSprite.addScript(firstScript); - firstScene.addSprite(firstSprite); - project.addScene(firstScene); - saveProjectSerial(project, ApplicationProvider.getApplicationContext()); - - Intent intent = new Intent(); - intent.putExtra(PROJECT_DIR, project.getDirectory()); - activityTestRule.launchActivity(intent); - } - - @After - public void tearDown() throws Exception { - sharedPreferences.edit() - .remove(NUMBER_OF_UPLOADED_PROJECTS) - .commit(); - ProjectManager.getInstance().setCurrentProject(null); - } - - //TODO: Test will be fixed as soon as the new upload project API call (CATROID-1251) is merged - /* - @Test - public void testUploadControllerGetsCalled() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit(); - - onView(withText(R.string.next)) - .perform(click()); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); - - onView(withText(R.string.next)) - .perform(click()); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); - - onView(withText(R.string.next)) - .perform(click()); - - ProjectUploadController projectUploadController = - activityTestRule.getActivity().getProjectUploadController(); - - Looper.prepare(); - verify(projectUploadController) - .startUpload(PROJECT_NAME, "", "", this.project); - Looper.myLooper().quit(); - } - */ - - @Test - public void uploadSuccessRatingDialogShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit(); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withText(R.string.next)) - .perform(click()); - - InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { - activityTestRule.getActivity().showUploadDialog(); - activityTestRule.getActivity().onReceiveResult(UPLOAD_RESULT_RECEIVER_RESULT_CODE, bundle); - }); - - onView(withText(R.string.rating_dialog_rate_now)) - .check(matches(isDisplayed())); - } - - @Test - public void firstUploadSuccessRatingDialogNotShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 0) - .commit(); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withText(R.string.next)) - .perform(click()); - - InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { - activityTestRule.getActivity().showUploadDialog(); - activityTestRule.getActivity().onReceiveResult(UPLOAD_RESULT_RECEIVER_RESULT_CODE, bundle); - }); - - onView(withText(R.string.rating_dialog_rate_now)) - .check(doesNotExist()); - } - - @Test - public void thirdUploadSuccessRatingDialogNotShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 2) - .commit(); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withText(R.string.next)) - .perform(click()); - - InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { - activityTestRule.getActivity().showUploadDialog(); - activityTestRule.getActivity().onReceiveResult(UPLOAD_RESULT_RECEIVER_RESULT_CODE, bundle); - }); - - onView(withText(R.string.rating_dialog_rate_now)) - .check(doesNotExist()); - } - - @Test - public void uploadFailRatingDialogNotShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit(); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withId(R.id.next)) - .perform(click()); - - onView(withText(R.string.next)) - .perform(click()); - - InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { - activityTestRule.getActivity().showUploadDialog(); - activityTestRule.getActivity().onReceiveResult(0, bundle); - }); - - onView(withText(R.string.rating_dialog_rate_now)) - .check(doesNotExist()); - } - - @Test - public void uploadProjectWithAlreadyExistingName() { - activityTestRule.getActivity().addProjectName(PROJECT_NAME); - onView(withId(R.id.next)) - .perform(click()); - - onView(withText(R.string.overwrite_text)).check(matches(isDisplayed())); - } - - public static class ProjectUploadTestActivity extends ProjectUploadActivity { - @NotNull - @Override - protected ProjectUploadController createProjectUploadController() { - projectUploadController = spy(new ProjectUploadController(this)); - return projectUploadController; - } - - @Override - protected void verifyUserIdentity() { - onCreateView(); - } - - public ProjectUploadController getProjectUploadController() { - return projectUploadController; - } - } -} diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt deleted file mode 100644 index 4864eb1e616..00000000000 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.kt +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2022 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.activity - -import android.content.Context -import android.content.Intent -import android.content.SharedPreferences -import android.os.Bundle -import android.os.Looper -import android.preference.PreferenceManager -import androidx.test.core.app.ApplicationProvider.getApplicationContext -import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.replaceText -import androidx.test.espresso.assertion.ViewAssertions.doesNotExist -import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers.isDisplayed -import androidx.test.espresso.matcher.ViewMatchers.withId -import androidx.test.espresso.matcher.ViewMatchers.withText -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation -import androidx.test.uiautomator.UiDevice -import org.catrobat.catroid.ProjectManager -import org.catrobat.catroid.R -import org.catrobat.catroid.common.Constants.UPLOAD_RESULT_RECEIVER_RESULT_CODE -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.io.asynctask.saveProjectSerial -import org.catrobat.catroid.ui.NUMBER_OF_UPLOADED_PROJECTS -import org.catrobat.catroid.ui.PROJECT_DIR -import org.catrobat.catroid.ui.ProjectUploadActivity -import org.catrobat.catroid.ui.controller.ProjectUploadController -import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule -import org.junit.Assert.assertFalse -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mockito.spy -import org.mockito.Mockito.verify - -@RunWith(AndroidJUnit4::class) -class ProjectUploadDialogTest { - private lateinit var bundle: Bundle - private lateinit var project: Project - private lateinit var sharedPreferences: SharedPreferences - private val projectName = ProjectUploadDialogTest::class.java.simpleName - - @get:Rule - val activityTestRule = BaseActivityTestRule( - ProjectUploadTestActivity::class.java, - false, false) - - @Before - fun setUp() { - sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()) - bundle = Bundle() - - project = Project(getApplicationContext(), projectName, false) - val firstScene = Scene("scene", project) - ProjectManager.getInstance().currentProject = project - val firstSprite = Sprite("firstSprite") - val firstScript: Script = StartScript() - firstSprite.addScript(firstScript) - firstScene.addSprite(firstSprite) - project.addScene(firstScene) - saveProjectSerial(project, getApplicationContext()) - val intent = Intent() - intent.putExtra(PROJECT_DIR, project.directory) - activityTestRule.launchActivity(intent) - } - - @Test - fun testUploadControllerGetsCalled() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit() - - onView(withText(R.string.next)) - .perform(click()) - getInstrumentation().waitForIdleSync() - - onView(withText(R.string.next)) - .perform(click()) - getInstrumentation().waitForIdleSync() - - onView(withText(R.string.next)) - .perform(click()) - - val projectUploadController = activityTestRule.activity.projectUploadController() - - Looper.prepare() - verify(projectUploadController)?.startUpload(projectName, "", "", project) - Looper.myLooper()?.quit() - } - - @Test - fun uploadSuccessRatingDialogShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit() - - onView(withId(R.id.next)) - .perform(click()) - - onView(withId(R.id.next)) - .perform(click()) - - onView(withText(R.string.next)) - .perform(click()) - - getInstrumentation().runOnMainSync { - activityTestRule.activity.showUploadDialog() - activityTestRule.activity.onReceiveResult(UPLOAD_RESULT_RECEIVER_RESULT_CODE, bundle) - } - - onView(withText(R.string.rating_dialog_rate_now)) - .check(matches(isDisplayed())) - } - - @Test - fun firstUploadSuccessRatingDialogNotShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 0) - .commit() - - onView(withId(R.id.next)) - .perform(click()) - - onView(withId(R.id.next)) - .perform(click()) - - onView(withText(R.string.next)) - .perform(click()) - - getInstrumentation().runOnMainSync { - activityTestRule.activity.showUploadDialog() - activityTestRule.activity.onReceiveResult(UPLOAD_RESULT_RECEIVER_RESULT_CODE, bundle) - } - - onView(withText(R.string.rating_dialog_rate_now)) - .check(doesNotExist()) - } - - @Test - fun thirdUploadSuccessRatingDialogNotShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 2) - .commit() - - onView(withId(R.id.next)) - .perform(click()) - - onView(withId(R.id.next)) - .perform(click()) - - onView(withText(R.string.next)) - .perform(click()) - - getInstrumentation().runOnMainSync { - activityTestRule.activity.showUploadDialog() - activityTestRule.activity.onReceiveResult(UPLOAD_RESULT_RECEIVER_RESULT_CODE, bundle) - } - - onView(withText(R.string.rating_dialog_rate_now)) - .check(doesNotExist()) - } - - @Test - fun uploadFailRatingDialogNotShowing() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit() - - onView(withId(R.id.next)) - .perform(click()) - - onView(withId(R.id.next)) - .perform(click()) - - onView(withText(R.string.next)) - .perform(click()) - - getInstrumentation().runOnMainSync { - activityTestRule.activity.showUploadDialog() - activityTestRule.activity.onReceiveResult(0, bundle) - } - - onView(withText(R.string.rating_dialog_rate_now)) - .check(doesNotExist()) - } - - @Test - fun testUploadDefaultProjectName() { - val defaultProjectName = getApplicationContext().resources.getString(R.string.default_project_name) - val errorMessage = getApplicationContext().resources.getString(R.string.error_upload_project_with_default_name, defaultProjectName) - - onView(withId(R.id.project_upload_name)) - .perform(replaceText(defaultProjectName)) - - onView(withText(errorMessage)) - .check(matches(isDisplayed())) - } - - @Test - fun testSoftKeyboardNotShownBehindDialog() { - sharedPreferences.edit() - .putInt(NUMBER_OF_UPLOADED_PROJECTS, 1) - .commit() - - onView(withText(R.string.next)) - .perform(click()) - getInstrumentation().waitForIdleSync() - - onView(withId(R.id.project_notes_and_credits_upload)) - .perform(click()) - - onView(withText(R.string.next)) - .perform(click()) - getInstrumentation().waitForIdleSync() - - assertFalse(isKeyboardVisible()) - } - - private fun isKeyboardVisible(): Boolean { - val checkKeyboardCommand = "dumpsys input_method | grep mInputShown" - return UiDevice.getInstance(getInstrumentation()).executeShellCommand(checkKeyboardCommand).contains("mInputShown=true") - } - - class ProjectUploadTestActivity : ProjectUploadActivity() { - override fun createProjectUploadController(): ProjectUploadController? { - projectUploadController = spy(ProjectUploadController(this)) - return projectUploadController - } - - override fun verifyUserIdentity() { - onTokenCheckComplete(true, false) - } - - fun projectUploadController(): ProjectUploadController? = projectUploadController - } -} diff --git a/catroid/src/debug/AndroidManifest.xml b/catroid/src/debug/AndroidManifest.xml index 6484764d09c..776a1698da4 100644 --- a/catroid/src/debug/AndroidManifest.xml +++ b/catroid/src/debug/AndroidManifest.xml @@ -33,15 +33,6 @@ - - - - - - diff --git a/catroid/src/main/AndroidManifest.xml b/catroid/src/main/AndroidManifest.xml index 9641d578c1d..0f88a2bfcfa 100644 --- a/catroid/src/main/AndroidManifest.xml +++ b/catroid/src/main/AndroidManifest.xml @@ -231,10 +231,8 @@ - - ) * * This program is free software: you can redistribute it and/or modify @@ -93,7 +93,6 @@ interface WebService { @POST("user") fun register( - @Header("Authorization") bearerToken: String, @Body user: RegisterUser ): Call @@ -126,8 +125,9 @@ interface WebService { @Header("Authorization") bearerToken: String, @PartMap partMap: Map, @Part projectFile: MultipartBody.Part - ) : Call + ): Call + @SuppressWarnings("LongParameterList") @GET("projects/user") fun getUserProjects( @Header("Authorization") bearerToken: String, diff --git a/catroid/src/main/java/org/catrobat/catroid/retrofit/models/ProjectDataClasses.kt b/catroid/src/main/java/org/catrobat/catroid/retrofit/models/ProjectDataClasses.kt index 10199e0126d..bb0f58a8ed4 100644 --- a/catroid/src/main/java/org/catrobat/catroid/retrofit/models/ProjectDataClasses.kt +++ b/catroid/src/main/java/org/catrobat/catroid/retrofit/models/ProjectDataClasses.kt @@ -27,7 +27,6 @@ import androidx.room.Embedded import androidx.room.Entity import androidx.room.PrimaryKey import androidx.room.Relation -import java.io.File @SuppressWarnings("ConstructorParameterNaming") @Entity(tableName = "featured_project") diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/GetUserProjectsTask.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/GetUserProjectsTask.kt index e6ed39de97a..55f2373f0ff 100644 --- a/catroid/src/main/java/org/catrobat/catroid/transfers/GetUserProjectsTask.kt +++ b/catroid/src/main/java/org/catrobat/catroid/transfers/GetUserProjectsTask.kt @@ -87,4 +87,4 @@ class GetUserProjectsTask(private val webServer: WebService) { companion object { private val TAG = GetUserProjectsTask::class.java.simpleName } -} \ No newline at end of file +} diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/ProjectUploadTask.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/ProjectUploadTask.kt index 5f11d994303..10ce06e3a47 100644 --- a/catroid/src/main/java/org/catrobat/catroid/transfers/ProjectUploadTask.kt +++ b/catroid/src/main/java/org/catrobat/catroid/transfers/ProjectUploadTask.kt @@ -45,8 +45,11 @@ class ProjectUploadTask(private val webServer: WebService) { fun getErrorMessage(): String = errorMessage fun uploadProject( - projectZip: File, checksum: String, idToken: String, flavor: String? = null, isPrivate: - Boolean? = null + projectZip: File, + checksum: String, + idToken: String, + flavor: String? = null, + isPrivate: Boolean? = null ) { Log.d(TAG, "Starting project upload") @@ -60,20 +63,16 @@ class ProjectUploadTask(private val webServer: WebService) { val map: HashMap = HashMap() map["checksum"] = RequestBody.create(MultipartBody.FORM, checksum) - if (isPrivate != null) - { + if (isPrivate != null) { map["private"] = RequestBody.create(MultipartBody.FORM, isPrivate.toString()) } - if (flavor != null) - { + if (flavor != null) { map["flavor"] = RequestBody.create(MultipartBody.FORM, flavor) } val uploadProjectCall: Call = webServer.uploadProject( - "Bearer $idToken", - map, - body + "Bearer $idToken", map, body ) uploadProjectCall.enqueue(object : Callback { @@ -94,8 +93,7 @@ class ProjectUploadTask(private val webServer: WebService) { else -> { Log.e( TAG, - "Not accepted StatusCode: $statusCode on project upload; Server " + - "Answer: ${response.body()}" + "Not accepted StatusCode: $statusCode on project upload; Server " + "Answer: ${response.body()}" ) errorMessage = "Project could not be uploaded!" projectUploadResponse.postValue(null) diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/RegistrationViewModel.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/RegistrationViewModel.kt index 6f0a2df20e0..7cd0f17693b 100644 --- a/catroid/src/main/java/org/catrobat/catroid/transfers/RegistrationViewModel.kt +++ b/catroid/src/main/java/org/catrobat/catroid/transfers/RegistrationViewModel.kt @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2018 The Catrobat Team + * Copyright (C) 2010-2023 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -58,9 +58,10 @@ class RegistrationViewModel(private val webServer: WebService) : ViewModel() { private val usernameInUse = MutableLiveData(false) fun isUserNameInUse(): LiveData = usernameInUse - fun register(dryRun: Boolean, email: String, username: String, password: String, token: String) { - val registerCall: Call = webServer.register("Bearer $token", RegisterUser - (dryRun, email, username, password)) + fun register(dryRun: Boolean, email: String, username: String, password: String) { + val registerCall: Call = webServer.register( + RegisterUser(dryRun, email, username, password) + ) registerCall.enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectUpload.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectUpload.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.kt b/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.kt index c59c459a233..962d45f3e65 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.kt @@ -61,19 +61,12 @@ import org.catrobat.catroid.databinding.DialogReplaceApiKeyBinding import org.catrobat.catroid.databinding.DialogUploadUnchangedProjectBinding import org.catrobat.catroid.exceptions.ProjectException import org.catrobat.catroid.io.ProjectAndSceneScreenshotLoader -import org.catrobat.catroid.io.asynctask.ProjectLoadTask.ProjectLoadListener import org.catrobat.catroid.retrofit.models.ProjectUploadResponseApi import org.catrobat.catroid.transfers.ProjectUploadTask import org.catrobat.catroid.io.asynctask.ProjectLoader.ProjectLoadListener -import org.catrobat.catroid.io.asynctask.loadProject -import org.catrobat.catroid.io.asynctask.renameProject import org.catrobat.catroid.transfers.GetUserProjectsTask import org.catrobat.catroid.transfers.TagsTask import org.catrobat.catroid.transfers.TokenTask -import org.catrobat.catroid.transfers.project.ResultReceiverWrapper -import org.catrobat.catroid.transfers.project.ResultReceiverWrapperInterface -import org.catrobat.catroid.ui.controller.ProjectUploadController -import org.catrobat.catroid.ui.controller.ProjectUploadController.ProjectUploadInterface import org.catrobat.catroid.ui.recyclerview.dialog.TextInputDialog import org.catrobat.catroid.ui.recyclerview.dialog.textwatcher.InputWatcher import org.catrobat.catroid.utils.FileMetaDataExtractor @@ -177,11 +170,11 @@ open class ProjectUploadActivity : BaseActivity(), getUserProjectsTask.clear() getUserProjectsTask.getUserProjectsResponse() - .observe(this) { getUserProjectsResponse -> - getUserProjectsResponse?.let { + .observe(this) { projectResponse -> + projectResponse?.let { Log.d(TAG, "We got a response!") extractProjectNamesFromResponseJob = GlobalScope.launch(Dispatchers.Main) { - for(response in getUserProjectsResponse) { + for (response in projectResponse) { projectNamesOfUser.add(response.name) } } @@ -332,12 +325,12 @@ open class ProjectUploadActivity : BaseActivity(), return } - if (checkIfProjectNameAlreadyExists(binding.inputProjectName.editText?.text.toString())) { + if (projectNamesOfUser + .contains(binding.inputProjectName.editText?.text.toString()) + ) { Log.e(TAG, "Name is not unique, show Overwrite Dialog!") showOverwriteDialog() - } - else - { + } else { Log.d(TAG, "Name is unique") } @@ -518,10 +511,6 @@ open class ProjectUploadActivity : BaseActivity(), } } - private fun checkIfProjectNameAlreadyExists(name: String) : Boolean { - return projectNamesOfUser.contains(name) - } - private fun showOverwriteDialog() { val view = View.inflate(this, R.layout.dialog_overwrite_project, null) val radioGroup = view.findViewById(R.id.radio_group) @@ -529,7 +518,7 @@ open class ProjectUploadActivity : BaseActivity(), val textWatcher: InputWatcher.TextWatcher = object : InputWatcher.TextWatcher() { override fun isNameUnique(name: String?): Boolean { - return name?.let { checkIfProjectNameAlreadyExists(it) } ?: true + return name?.let { projectNamesOfUser.contains(it) } ?: true } } @@ -538,16 +527,12 @@ open class ProjectUploadActivity : BaseActivity(), .setTextWatcher(textWatcher) .setPositiveButton( getString(R.string.ok), - TextInputDialog.OnClickListener {dialog: DialogInterface?, textInput: String? -> + TextInputDialog.OnClickListener { dialog: DialogInterface?, textInput: String? -> when (radioGroup.checkedRadioButtonId) { - R.id.rename -> { - if (textInput != null) { - project.name = textInput - } - } - R.id.replace -> { - Log.d(TAG, "Project will be overwritten!") + R.id.rename -> if (textInput != null) { + project.name = textInput } + R.id.replace -> Log.d(TAG, "Project will be overwritten!") else -> throw java.lang.IllegalStateException("Cannot find Radio Button") } } @@ -558,7 +543,7 @@ open class ProjectUploadActivity : BaseActivity(), .setNegativeButton(R.string.cancel, null) .create() - radioGroup.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener {group: + radioGroup.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { group: RadioGroup?, checkedId: Int -> when (checkedId) { R.id.replace -> { @@ -626,6 +611,7 @@ open class ProjectUploadActivity : BaseActivity(), uploadProgressDialog?.findViewById(R.id.dialog_upload_progress_image) image?.setImageResource(R.drawable.ic_upload_failed) image?.visibility = View.VISIBLE + Log.e(TAG, errorMessage) } private fun showSuccessDialog(projectMetaData: ProjectUploadResponseApi) { @@ -742,23 +728,6 @@ open class ProjectUploadActivity : BaseActivity(), tokenTask.refreshToken(token, refreshToken) } - @Deprecated("Use new API call instead", ReplaceWith("checkRefreshToken(token, refreshToken)")) - private fun checkDeprecatedToken(token: String) { - tokenTask.getUpgradeTokenResponse().observe(this, Observer { upgradeResponse -> - upgradeResponse?.let { - sharedPreferences.edit() - .putString(Constants.TOKEN, upgradeResponse.token) - .putString(Constants.REFRESH_TOKEN, upgradeResponse.refresh_token) - .apply() - onCreateView() - } ?: run { - verifyUserIdentityFailed() - } - }) - - tokenTask.upgradeToken(token) - } - private fun verifyUserIdentityFailed() { ToastUtil.showError(this, R.string.error_session_expired) Utils.logoutUser(this) diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.kt b/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.kt index 8f0d77a65d7..7875c398ba0 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.kt @@ -148,8 +148,7 @@ class WebViewActivity : AppCompatActivity() { val request = DownloadManager.Request(Uri.parse(downloadUrl)) val projectName = getProjectNameFromUrl(downloadUrl) request.run { - setTitle(getString(R.string.notification_download_title_pending) + " " + - projectName) + setTitle(getString(R.string.notification_download_title_pending) + " " + projectName) setDescription(getString(R.string.notification_download_pending)) setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) setDestinationInExternalPublicDir(DIRECTORY_DOWNLOADS, projectName + ANDROID_APPLICATION_EXTENSION) diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt b/catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/RegistrationDialogFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/RegistrationDialogFragment.kt index 6ef0caf02cf..117ad76b00e 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/RegistrationDialogFragment.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/RegistrationDialogFragment.kt @@ -1,6 +1,6 @@ /* * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2022 The Catrobat Team + * Copyright (C) 2010-2023 The Catrobat Team * () * * This program is free software: you can redistribute it and/or modify @@ -31,7 +31,6 @@ import android.preference.PreferenceManager import android.text.Editable import android.text.InputType import android.text.TextWatcher -import android.util.Log import android.util.Patterns import android.view.View import android.widget.CheckBox @@ -294,9 +293,7 @@ class RegistrationDialogFragment : DialogFragment() { connectionMonitor.observe(this, Observer { connectionActive -> if (connectionActive) { viewModel.setIsRegistering() - val token = sharedPreferences?.getString(Constants.TOKEN, Constants.NO_TOKEN).orEmpty() - Log.d(LoginDialogFragment.TAG, "Token stored in shared preferences $token") - viewModel.register(true, email, username, password, token) + viewModel.register(true, email, username, password) } else { ToastUtil.showError(context, R.string.error_internet_connection) } diff --git a/catroid/src/main/java/org/catrobat/catroid/utils/ProjectZipper.kt b/catroid/src/main/java/org/catrobat/catroid/utils/ProjectZipper.kt index d7b53af7f4a..20ed43ab95d 100644 --- a/catroid/src/main/java/org/catrobat/catroid/utils/ProjectZipper.kt +++ b/catroid/src/main/java/org/catrobat/catroid/utils/ProjectZipper.kt @@ -24,7 +24,7 @@ package org.catrobat.catroid.utils import android.util.Log -import org.catrobat.catroid.common.Constants.DEVICE_VARIABLE_JSON_FILENAME +import org.catrobat.catroid.common.Constants.DEVICE_VARIABLE_JSON_FILE_NAME import org.catrobat.catroid.io.ZipArchiver import java.io.File import java.io.IOException @@ -42,7 +42,7 @@ object ProjectZipper { return try { val fileList = projectDirectory.listFiles() val filteredFileList = - fileList.filter { file -> file.name != DEVICE_VARIABLE_JSON_FILENAME } + fileList.filter { file -> file.name != DEVICE_VARIABLE_JSON_FILE_NAME } ZipArchiver().zip(archiveDirectory, filteredFileList.toTypedArray()) Log.d(TAG, "Zipping done") archiveDirectory diff --git a/catroid/src/main/java/org/catrobat/catroid/utils/Utils.java b/catroid/src/main/java/org/catrobat/catroid/utils/Utils.java index 66e5b94419d..8ae253ca934 100644 --- a/catroid/src/main/java/org/catrobat/catroid/utils/Utils.java +++ b/catroid/src/main/java/org/catrobat/catroid/utils/Utils.java @@ -36,10 +36,10 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; -import android.webkit.CookieManager; import android.view.View; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; +import android.webkit.CookieManager; import com.google.android.gms.auth.api.signin.GoogleSignIn; import com.google.android.gms.auth.api.signin.GoogleSignInOptions; @@ -601,7 +601,7 @@ public static void removeExifData(File directory, String fileName) { File file = new File(directory, fileName); try { ExifInterface exif = new ExifInterface(file.getAbsolutePath()); - for (String exifTag: EXIFTAGS_FOR_EXIFREMOVER) { + for (String exifTag : EXIFTAGS_FOR_EXIFREMOVER) { exif.setAttribute(exifTag, ""); } exif.saveAttributes(); @@ -612,7 +612,7 @@ public static void removeExifData(File directory, String fileName) { public static boolean checkForDuplicates(List anyList) { Object prev = null; - for (Object it: anyList) { + for (Object it : anyList) { if (it == prev) { return true; } diff --git a/catroid/src/main/java/org/catrobat/catroid/utils/notifications/StatusBarNotificationManager.java b/catroid/src/main/java/org/catrobat/catroid/utils/notifications/StatusBarNotificationManager.java index 5260d2e5732..777cddad23d 100644 --- a/catroid/src/main/java/org/catrobat/catroid/utils/notifications/StatusBarNotificationManager.java +++ b/catroid/src/main/java/org/catrobat/catroid/utils/notifications/StatusBarNotificationManager.java @@ -22,32 +22,24 @@ */ package org.catrobat.catroid.utils.notifications; -import android.app.IntentService; -import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; import android.database.Cursor; -import android.media.RingtoneManager; import android.net.Uri; import android.os.Build; -import android.os.Bundle; import android.provider.MediaStore; import android.util.Log; import org.catrobat.catroid.R; -import org.catrobat.catroid.common.Constants; -import org.catrobat.catroid.ui.MainMenuActivity; import org.catrobat.catroid.utils.ToastUtil; import androidx.annotation.StringRes; -import androidx.core.app.NotificationCompat; import kotlin.jvm.Synchronized; -import static org.catrobat.catroid.common.Constants.*; +import static org.catrobat.catroid.common.Constants.MAX_PERCENT; public final class StatusBarNotificationManager { private static final String TAG = StatusBarNotificationManager.class.getSimpleName(); @@ -61,26 +53,6 @@ public StatusBarNotificationManager(Context context) { createNotificationChannel(context); } - private NotificationData createAndShowUploadNotification(Context context, String programName) { - if (context == null || programName == null) { - return null; - } - - Intent uploadIntent = new Intent(context, MainMenuActivity.class); - uploadIntent.setAction(Intent.ACTION_MAIN); - uploadIntent = uploadIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); - PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationId, uploadIntent, - PendingIntent.FLAG_CANCEL_CURRENT); - - NotificationData data = new NotificationData(R.drawable.ic_stat, programName, - context.getString(R.string.notification_upload_title_pending), context.getString(R.string.notification_upload_title_finished), - context.getString(R.string.notification_upload_pending), context.getString(R.string.notification_upload_finished), - 0, MAX_PERCENT, true, false, getNextNotificationID()); - - showOrUpdateNotification(context, data, 0, pendingIntent); - return data; - } - public NotificationData createSaveProjectToExternalMemoryNotification(Context context, Uri projectDestination, String programName) { if (context == null || programName == null) { diff --git a/catroid/src/main/java/org/catrobat/catroid/web/requests/HttpRequests.kt b/catroid/src/main/java/org/catrobat/catroid/web/requests/HttpRequests.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/catroid/src/main/res/values-af/strings.xml b/catroid/src/main/res/values-af/strings.xml index c5c3e50ca6f..2d38f5a6d98 100644 --- a/catroid/src/main/res/values-af/strings.xml +++ b/catroid/src/main/res/values-af/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ar/strings.xml b/catroid/src/main/res/values-ar/strings.xml index 707b1d19dc4..0813e399acd 100644 --- a/catroid/src/main/res/values-ar/strings.xml +++ b/catroid/src/main/res/values-ar/strings.xml @@ -1420,13 +1420,6 @@ معاينة الصورة المحفوظة الغاء تحميل المشروع إلغاء اللتحميل/إعادة التحويل البرنامج - "التحميل " - "أنظر الى" - جاري التحميل - تم التحميل بنجاح - تم رفض تحميل البرنامج - إعادة المحاولة - فتح في بلي ستور "التنزيل " جاري التنزيل تم التنزيل بنجاح @@ -1440,7 +1433,6 @@ ومن أجل استيراد وتصدير المشاريع من والى الذاكرة الخارجية, التطبيق يحتاج إذن القراء والكتابة. يمكنك دائماً تغيير الاذونات الممنوحة للتطبيق من إعدادات الجهاز. - حدث خطأ أثناء تحميل البرنامج. حدث خطأ أثناء تنزيل البرنامج. "المشروع %s في قائمة الانتظار بالفعل." "لا يمكن أن يكون تحميلك diff --git a/catroid/src/main/res/values-az/strings.xml b/catroid/src/main/res/values-az/strings.xml index 4ea63c99471..1315d884b74 100644 --- a/catroid/src/main/res/values-az/strings.xml +++ b/catroid/src/main/res/values-az/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading" - "Look at" - Upload in progress - Upload successful - Uploaded project rejected - Təkrar yoxla - Open App store "Downloading" Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-bg/strings.xml b/catroid/src/main/res/values-bg/strings.xml index 80000ab6c53..d6f301ca1f4 100644 --- a/catroid/src/main/res/values-bg/strings.xml +++ b/catroid/src/main/res/values-bg/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-bn/strings.xml b/catroid/src/main/res/values-bn/strings.xml index 5237002fc1e..97550fca5f1 100644 --- a/catroid/src/main/res/values-bn/strings.xml +++ b/catroid/src/main/res/values-bn/strings.xml @@ -1218,13 +1218,6 @@ পূর্বরূপ চিত্র সংরক্ষণ করা হয়েছে প্রজেক্ট ডাউনলোড বাতিল করুন ডাউনলোড করা / পুনর্নির্মাণ প্রজেক্ট বাতিল হয়েছে - "আপলোড হচ্ছ …" - "তাকানো" - আপলোড চলছে - আপলোড সফল - আপলোড করা প্রকল্প বাতিল হয়েছে - পুনরায় চেষ্টা করুন - অ্যাপ স্টোর খুলুন "ডাউনলোড হচ্ছে" আপলোড চলছে ডাউনলোড সফল @@ -1234,7 +1227,6 @@ এই অ্যাপ্লিকেশনটির সঠিকভাবে কাজ করার জন্য অনুরোধ করা অনুমতিগুলি দরকার। উদাহরণস্বরূপ, ক্যামেরা ব্রিক ডিভাইসের ক্যামেরায় অ্যাক্সেস প্রয়োজন, \"অবস্থান\" সূত্র উপাদানটি ডিভাইসের ভূ-অবস্থান সেন্সরটিতে অ্যাক্সেসের প্রয়োজন, এবং স্থানীয় মেমরি থেকে এবং আমদানি ও রফতানি করতে অ্যাপ্লিকেশনটিকে এটি পড়তে এবং লেখার অ্যাক্সেসের প্রয়োজন । আপনি সর্বদা আপনার ডিভাইসের সেটিংসের মাধ্যমে অনুমতিগুলি পরিবর্তন করতে পারেন। - প্রজেক্টটি আপলোড করার সময় কিছু ভুল হয়েছে। প্রজেক্টটি ডাউনলোড করার সময় কিছু ভুল হয়েছে। "প্রকল্প %s ইতিমধ্যে সারিতে রয়েছে।" "আপনার ডাউনলোড হতে পারে না diff --git a/catroid/src/main/res/values-bs/strings.xml b/catroid/src/main/res/values-bs/strings.xml index d0cc94f5640..a717154a56c 100644 --- a/catroid/src/main/res/values-bs/strings.xml +++ b/catroid/src/main/res/values-bs/strings.xml @@ -1277,13 +1277,6 @@ Prikažite sačuvanu sliku Otkažite preuzimanje projekta Otkazano preuzimanje/konvertovanje projekata - "Postavljanje" - "Look at" - Preuzimanje u toku - Preuzimanje uspješno - Preuzeti projekat odbijen - Pokušajte ponovo - Otvorite App store "Preuzimanje " Preuzimanje u toku Preuzimanje je uspjelo @@ -1296,7 +1289,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Nešto je pošlo po zlu pri postavljanju projekta. Došlo je do greške prilikom preuzimanja programa. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-ca/strings.xml b/catroid/src/main/res/values-ca/strings.xml index c93592faba8..9dfe45fc512 100644 --- a/catroid/src/main/res/values-ca/strings.xml +++ b/catroid/src/main/res/values-ca/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading" - "Look at" - Upload in progress - Upload successful - Uploaded project rejected - Torna-ho a intentar - Open App store "Downloading" Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-chr/strings.xml b/catroid/src/main/res/values-chr/strings.xml index 50d9b713a42..47f0bbaf73a 100644 --- a/catroid/src/main/res/values-chr/strings.xml +++ b/catroid/src/main/res/values-chr/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-cs/strings.xml b/catroid/src/main/res/values-cs/strings.xml index d2b842a97ab..da2e293cffe 100644 --- a/catroid/src/main/res/values-cs/strings.xml +++ b/catroid/src/main/res/values-cs/strings.xml @@ -1334,13 +1334,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Nahrávání " - "Podívej se na " - Probíhá nahrávání - Nahráno úspěšně - Nahrávaný program zamítnut - Zkusit znovu - Open App store "Stahování " Probíhá stahování Staženo úspěšně @@ -1353,7 +1346,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Došlo k chybě při nahrávání programu. Došlo k chybě při stahování programu. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-da/strings.xml b/catroid/src/main/res/values-da/strings.xml index 2a55cd86de3..d3bb80b8c50 100644 --- a/catroid/src/main/res/values-da/strings.xml +++ b/catroid/src/main/res/values-da/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploader" - "Se på" - Upload i gang - Upload succesfuld - Uploadet program afvist - Retry - Open App store "Downloader" Download i gang Download succesfuld @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Der opstod en fejl under upload af programmet. Der opstod en fejl under download af programmet. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-de/strings.xml b/catroid/src/main/res/values-de/strings.xml index afe24bd3b44..aa0a065b784 100644 --- a/catroid/src/main/res/values-de/strings.xml +++ b/catroid/src/main/res/values-de/strings.xml @@ -1224,13 +1224,6 @@ Bildvorschau gespeichert Projektdownload abbrechen Download/Rückkonvertierung des Projektes abgebrochen - "Hochladen von " - "Anschauen von " - Upload wird ausgeführt - Upload erfolgreich - Upload des Projekts verweigert - Wiederholen - Öffnen im Play Store "Herunterladen von " Download wird ausgeführt Download erfolgreich @@ -1240,7 +1233,6 @@ 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. - Beim Hochladen des Projekts ist ein Fehler aufgetreten. Beim Herunterladen des Projekts ist ein Fehler aufgetreten. "Projekt %s bereits in Warteschlange." Der Download konnte nicht gestartet werden, es scheint als gäbe es ein Problem mit unserem Server. diff --git a/catroid/src/main/res/values-el/strings.xml b/catroid/src/main/res/values-el/strings.xml index 48e5e22d0f5..0b69f31c819 100644 --- a/catroid/src/main/res/values-el/strings.xml +++ b/catroid/src/main/res/values-el/strings.xml @@ -1242,13 +1242,6 @@ 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 @@ -1261,7 +1254,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-en-rAU/strings.xml b/catroid/src/main/res/values-en-rAU/strings.xml index 6783889f474..ddf6fe1c565 100644 --- a/catroid/src/main/res/values-en-rAU/strings.xml +++ b/catroid/src/main/res/values-en-rAU/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-en-rCA/strings.xml b/catroid/src/main/res/values-en-rCA/strings.xml index e0572cb280a..1df37ac32ab 100644 --- a/catroid/src/main/res/values-en-rCA/strings.xml +++ b/catroid/src/main/res/values-en-rCA/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-en-rGB/strings.xml b/catroid/src/main/res/values-en-rGB/strings.xml index 7a89bae1910..6322642e7cc 100644 --- a/catroid/src/main/res/values-en-rGB/strings.xml +++ b/catroid/src/main/res/values-en-rGB/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading " - "Look at " - Upload in progress - Upload successful - Uploaded program rejected - Retry - Open App store "Downloading " Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - An error occurred while uploading the program. An error occurred while downloading the program. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-es/strings.xml b/catroid/src/main/res/values-es/strings.xml index 538a42ce620..48351254ac5 100644 --- a/catroid/src/main/res/values-es/strings.xml +++ b/catroid/src/main/res/values-es/strings.xml @@ -1239,13 +1239,6 @@ Vista previa guardada Cancelar la descarga del proyecto Descarga Cancelada/Reconvirtiendo programa - "Cargando " - "Apariencia en" - Carga en progreso - Carga exitosa - Programa subido rechazado - Intentelo otra vez - Abrir Play Store "Descargando " Descarga en progreso Descarga exitosa @@ -1257,7 +1250,6 @@ necesita acceso a la cámara del dispositivo, el elemento de fórmula \"ubicación\" necesita acceso al sensor de geolocalización del dispositivo, y con el fin de importar y exportar proyectos desde y hacia la memoria local, la aplicación necesita acceso de lectura y escritura a ella. Siempre puedes cambiar los permisos a través de la configuración de tu dispositivo. - Un error ha ocurrido durante el proceso de carga Un error ha ocurrido durante el proceso de descarga. "El proyecto %s ya está en cola." "Tu descarga no pudo ser diff --git a/catroid/src/main/res/values-eu-rES/strings.xml b/catroid/src/main/res/values-eu-rES/strings.xml index f6520071760..7fce2dc19d6 100644 --- a/catroid/src/main/res/values-eu-rES/strings.xml +++ b/catroid/src/main/res/values-eu-rES/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-fa-rIR/strings.xml b/catroid/src/main/res/values-fa-rIR/strings.xml index 9f9b0a864ec..343f501ad77 100644 --- a/catroid/src/main/res/values-fa-rIR/strings.xml +++ b/catroid/src/main/res/values-fa-rIR/strings.xml @@ -1229,13 +1229,6 @@ پیش نمایش تصویر ذخیره شد لغو بارگیری پروژه پروژه بارگیری/تبدیل مجدد لغو شد - "در حال بارگزاري" - "نگاه کن به " - آپلود در جریان است - آپلود با موفقیت انجام شد - برنامه آپلود شده رد شده - دوباره امتحان کن - فروشگاه برنامه را باز کنید "در حال دانلود " دانلود در جریان است بارگيري با موفقیت انجام شد @@ -1248,7 +1241,6 @@ سنسور موقعیت جغرافیایی دستگاه ، و به منظور واردات و صادرات پروژه ها از و به حافظه محلی ، برنامه نیاز به دسترسی به خواندن و نوشتن دارد. همیشه می توانید مجوزها را از طریق تنظیمات دستگاه خود تغییر دهید. - خطایی هنگام آپلود برنامه رخ داده است. خطایی هنگام دانلود برنامه رخ داده است. "پروژه %s در حال حاضر در صف است." "بارگیری شما شروع نمی شود ، به نظر diff --git a/catroid/src/main/res/values-fa/strings.xml b/catroid/src/main/res/values-fa/strings.xml index 24d74f1266c..deb854a8b4e 100644 --- a/catroid/src/main/res/values-fa/strings.xml +++ b/catroid/src/main/res/values-fa/strings.xml @@ -1180,13 +1180,6 @@ پیش نمایش تصویر ذخیره شد لغو دانلود پروژه دانلود/تبدیل مجدد پروژه لغو شد - "در حال آپلود" - "نگاه کنید" - آپلود در حال انجام است - آپلود با موفقیت انجام شد - پروژه آپلود شده رد شد - دوباره امتحان کنید - فروشگاه App را باز کنید "در حال دانلود" دانلود در حال انجام است دانلود با موفقیت انجام شد @@ -1196,7 +1189,6 @@ این برنامه برای عملکرد صحیح به مجوزهای درخواستی نیاز دارد. به عنوان مثال، آجر دوربین نیاز به دسترسی به دوربین دستگاه دارد، عنصر فرمول «مکان» نیاز به دسترسی به حسگر موقعیت جغرافیایی دستگاه دارد، و برای وارد کردن و صادرات پروژه ها از و به حافظه محلی، برنامه نیاز به دسترسی خواندن و نوشتن به آن دارد. . همیشه می توانید مجوزها را از طریق تنظیمات دستگاه خود تغییر دهید. - هنگام بارگذاری پروژه مشکلی پیش آمد. هنگام دانلود پروژه مشکلی پیش آمد. "پروژه %s از قبل در صف است." "دانلود شما نمی تواند باشد diff --git a/catroid/src/main/res/values-fi/strings.xml b/catroid/src/main/res/values-fi/strings.xml index bfc5d81e029..5d4ae38b264 100644 --- a/catroid/src/main/res/values-fi/strings.xml +++ b/catroid/src/main/res/values-fi/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-fr/strings.xml b/catroid/src/main/res/values-fr/strings.xml index c757840d651..6e2af6ff410 100644 --- a/catroid/src/main/res/values-fr/strings.xml +++ b/catroid/src/main/res/values-fr/strings.xml @@ -1241,13 +1241,6 @@ Aperçu de l’image enregistrée Annuler le téléchargement du projet Téléchargement/reconversion du programme annulé - "Envoi " - "Regarder vers " - Envoi en cours - Envoi terminé - L\'envoi du programme a échoué - Réessayer - Ouvrir le Play Store "Téléchargement " Téléchargement en cours Téléchargement terminé @@ -1260,7 +1253,6 @@ caméra doit avoir accès à la caméra de l\'appareil, l\'élément de formule capteur de géolocalisation de l\'appareil, et pour importer et exporter des projets depuis et vers la mémoire locale, l\'appli doit avoir accès en lecture et en écriture à la mémoire locale. Vous pouvez toujours modifier les autorisations dans les paramètres de votre appareil. - Une erreur s\'est produite lors du téléchargement de l\'appli. Une erreur s\'est produite lors du téléchargement de l\'appli. "Le projet %s est déjà en file d'attente." "Votre téléchargement n\'a pas pu être démarré diff --git a/catroid/src/main/res/values-gl/strings.xml b/catroid/src/main/res/values-gl/strings.xml index b4441e500a3..24676ad31e7 100644 --- a/catroid/src/main/res/values-gl/strings.xml +++ b/catroid/src/main/res/values-gl/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading" - "Look at" - Upload in progress - Upload successful - Uploaded project rejected - Tentar de novo - Open App store "Downloading" Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-gu/strings.xml b/catroid/src/main/res/values-gu/strings.xml index ff951c0dba2..7675f5c8cff 100644 --- a/catroid/src/main/res/values-gu/strings.xml +++ b/catroid/src/main/res/values-gu/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ha/strings.xml b/catroid/src/main/res/values-ha/strings.xml index c5c3e50ca6f..2d38f5a6d98 100644 --- a/catroid/src/main/res/values-ha/strings.xml +++ b/catroid/src/main/res/values-ha/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-hi/strings.xml b/catroid/src/main/res/values-hi/strings.xml index 3d90fe195dc..efc3239de8a 100644 --- a/catroid/src/main/res/values-hi/strings.xml +++ b/catroid/src/main/res/values-hi/strings.xml @@ -1243,13 +1243,6 @@ पूर्वावलोकन छवि सहेजी गई प्रोजेक्ट डाउनलोड रद्द करें डाउनलोडिंग / पुनर्गठन परियोजना को रद्द कर दिया - "अपलोडिंग" - "की ओर देखें" - अपलोड प्रगति में है - सफलतापूर्वक अपलोड हो गया - अपलोड किया गया प्रोजेक्ट अस्वीकृत - पुनः प्रयास करें - ऐप स्टोर खोलें "डाउनलोड" डाउनलोड जारी है सफल डाउनलोड करें @@ -1262,7 +1255,6 @@ डिवाइस की जियोलोकेशन सेंसर, और स्थानीय मेमोरी और एप्लिकेशन से परियोजनाओं को आयात और निर्यात करने के लिए इसे पढ़ने और लिखने की आवश्यकता है। आप हमेशा अपने डिवाइस की सेटिंग के माध्यम से अनुमतियां बदल सकते हैं। - प्रोजेक्ट अपलोड करते समय कुछ गड़बड़ हो गई। प्रोजेक्ट डाउनलोड करते समय कुछ गड़बड़ हो गई। "प्रोजेक्ट %s पहले से ही कतार में है।" "आपका डाउनलोड नहीं हो सका diff --git a/catroid/src/main/res/values-hr/strings.xml b/catroid/src/main/res/values-hr/strings.xml index 886380d92c7..77e4a303da0 100644 --- a/catroid/src/main/res/values-hr/strings.xml +++ b/catroid/src/main/res/values-hr/strings.xml @@ -1286,13 +1286,6 @@ Pregled slike spremljen Otkazi preuzimanje projekta Otkazano preuzimanje/ponovno pretvaranje projekta - "Ucitavanje" - "Look at" - Prijenos u tijeku - Prijenos uspješan - Preneseni projekt odbijen - Pokušaj ponovno - Otvori trgovinu aplikacijama "Preuzimanje " Preuzimanje u tijeku Uspješno preuzimanje @@ -1305,7 +1298,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Doslo je do pogreske tijekom prenosenja projekta. Došlo je do pogreške tijekom preuzimanja programa. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-hu/strings.xml b/catroid/src/main/res/values-hu/strings.xml index bd468f6d6b6..42c99bcfc57 100644 --- a/catroid/src/main/res/values-hu/strings.xml +++ b/catroid/src/main/res/values-hu/strings.xml @@ -1245,13 +1245,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Feltöltés " - "Nézd " - Feltöltés folyamatban - Sikeres feltöltés - Feltöltött program elutasítva - Próbálkozás újra - Open App store "Letöltés " Letöltés folyamatban Letöltés sikeres @@ -1264,7 +1257,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Hiba történt a program feltöltése során. Hoba történt a program letöltése során. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-ig/strings.xml b/catroid/src/main/res/values-ig/strings.xml index 3ebda6e365f..37d007d4f39 100644 --- a/catroid/src/main/res/values-ig/strings.xml +++ b/catroid/src/main/res/values-ig/strings.xml @@ -1201,13 +1201,6 @@ 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 @@ -1220,7 +1213,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-in/strings.xml b/catroid/src/main/res/values-in/strings.xml index 7787136ac76..507c00bb708 100644 --- a/catroid/src/main/res/values-in/strings.xml +++ b/catroid/src/main/res/values-in/strings.xml @@ -1200,13 +1200,6 @@ Pratinjau gambar disimpan Batalkan pengunduhan proyek Membatalkan proses unduhan/mengubah kembali - "Mengunggah " - "Melihat kepda " - Pengunggahan dalam proses - Unggahan berhasil - Program yang diunggah ditolak - Coba Lagi - Buka Play Store "Unduh " Sedang mengunduh Berhasil mengunduh @@ -1219,7 +1212,6 @@ Batu bata kamera memerlukan akses ke kamera perangkat, elemen rumus \"lokasi\" m sensor geolokasi perangkat, dan untuk mengimpor dan mengekspor proyek dari dan ke memori lokal, aplikasi membutuhkan akses baca dan tulis untuk itu. Anda selalu dapat mengubah izin melalui pengaturan perangkat Anda. - Terjadi kesalahan pada saat memuat program. Terjadi kesalahan saat mengunduh program. "Proyek %s sudah dalam antrian." "Unduhan Anda tidak bisa diff --git a/catroid/src/main/res/values-it/strings.xml b/catroid/src/main/res/values-it/strings.xml index 14789156e44..a572dbacaaa 100644 --- a/catroid/src/main/res/values-it/strings.xml +++ b/catroid/src/main/res/values-it/strings.xml @@ -1248,13 +1248,6 @@ app Anteprima immagine salvata Download del progetto annullato Annullato il download/conversione del progetto - "Caricamento " - "Notifica da " - Caricamento in corso - Caricamento terminato con successo - L\'invio del progetto è stato rifiutato - Riprova - Apri Play Store "Download di " Download in corso Download completato @@ -1267,7 +1260,6 @@ 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 progetto. Errore durante il download del progetto. "Il progetto %s è già in coda." "Il download non può essere avviato, diff --git a/catroid/src/main/res/values-iw/strings.xml b/catroid/src/main/res/values-iw/strings.xml index ee57bfa7020..8722084344c 100644 --- a/catroid/src/main/res/values-iw/strings.xml +++ b/catroid/src/main/res/values-iw/strings.xml @@ -1339,13 +1339,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "טוען " - "Look at" - טעינה מתבצעת - העלאה הסתיימה בהצלחה - Uploaded project rejected - נסה שנית - Open App store "מתבצעת הורדה " הורדה מתבצעת הורדה הושלמה @@ -1358,7 +1351,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ja/strings.xml b/catroid/src/main/res/values-ja/strings.xml index f012fcfe528..e5d027f3128 100644 --- a/catroid/src/main/res/values-ja/strings.xml +++ b/catroid/src/main/res/values-ja/strings.xml @@ -1195,13 +1195,6 @@ プレビュー画像を保存しました プロジェクトのダウンロードをキャンセル プログラムのダウンロード/再変換をキャンセルしました - "アップロード中 " - "見てください：" - アップロードは進行中 - アップロードが成功 - アップロードしたプログラムが拒否されました - リトライ - Play ストア を開く "ダウンロード中 " ダウンロードが進行中 ダウンロードに成功しました @@ -1214,7 +1207,6 @@ また、プロジェクトをローカルメモリーとの間でインポートおよびエクスポートするためには、アプリはローカルメモリーに対する読み取りおよび書き込みのアクセスを必要とします。 読み込みと書き込みのアクセスが必要です。パーミッションの変更は、デバイスの設定からいつでも行えます。 - アップロード中にエラーが発生しました プログラムをダウンロード中にエラーが発生しました "プロジェクト %s はすでにキューに入っています。" 「ダウンロードを diff --git a/catroid/src/main/res/values-ka/strings.xml b/catroid/src/main/res/values-ka/strings.xml index e86a112363c..8f2c5e57a23 100644 --- a/catroid/src/main/res/values-ka/strings.xml +++ b/catroid/src/main/res/values-ka/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-kab/strings.xml b/catroid/src/main/res/values-kab/strings.xml index 2c3db942a1a..8674927f47d 100644 --- a/catroid/src/main/res/values-kab/strings.xml +++ b/catroid/src/main/res/values-kab/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-kk/strings.xml b/catroid/src/main/res/values-kk/strings.xml index a7f5aa07af8..462a37b7f54 100644 --- a/catroid/src/main/res/values-kk/strings.xml +++ b/catroid/src/main/res/values-kk/strings.xml @@ -1219,13 +1219,6 @@ 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 @@ -1238,7 +1231,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-kn/strings.xml b/catroid/src/main/res/values-kn/strings.xml index 3510766a22f..294b31d7607 100644 --- a/catroid/src/main/res/values-kn/strings.xml +++ b/catroid/src/main/res/values-kn/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading" - "Look at" - Upload in progress - Upload successful - Uploaded project rejected - ಮರುಯತ್ನಿಸಿ - Open App store "Downloading" Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ko/strings.xml b/catroid/src/main/res/values-ko/strings.xml index 935e76c1c4e..fea32d828d7 100644 --- a/catroid/src/main/res/values-ko/strings.xml +++ b/catroid/src/main/res/values-ko/strings.xml @@ -1174,13 +1174,6 @@ 캡쳐 하기 이미지 저장 프로젝트 다운로드 취소 프로그램 다운로드/변환 취소 - "업로드 중" - "방향 보기" - 업로드가 진행중 - 업로드 성공 - 프로그램 업로드 거부 - 다시 시도 - 플레이 스토어 열기 "다운로드 중 " 다운로드 진행 중 다운로드 성공 @@ -1190,7 +1183,6 @@ 이 앱은 기능의 권한이 필요합니다. 즉, 카메라 블록은 기기의 카메라 접근, \"위치\"기능은 기기의 위치 센서의 접근, 프로젝트를 불러오거나 저장하기 위한 일고 저장하는 기능 등. 기기의 설정을 통해 접근 권한을 변경할 수 있습니다. - 프로그램을 업로드하는 중에 오류가 발생했습니다. 프로그램을 다운로드하는 동안 오류가 발생했습니다. "프로그램이 %s 대기중." "다운로드할 수 없습니다. diff --git a/catroid/src/main/res/values-lt/strings.xml b/catroid/src/main/res/values-lt/strings.xml index ba1517a8b3d..f189518c3ae 100644 --- a/catroid/src/main/res/values-lt/strings.xml +++ b/catroid/src/main/res/values-lt/strings.xml @@ -1339,13 +1339,6 @@ 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 @@ -1358,7 +1351,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-mk/strings.xml b/catroid/src/main/res/values-mk/strings.xml index 95d32e61b0c..bae6d27e036 100644 --- a/catroid/src/main/res/values-mk/strings.xml +++ b/catroid/src/main/res/values-mk/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ml-rIN/strings.xml b/catroid/src/main/res/values-ml-rIN/strings.xml index d07beb4b264..6cddf40e59f 100644 --- a/catroid/src/main/res/values-ml-rIN/strings.xml +++ b/catroid/src/main/res/values-ml-rIN/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ml/strings.xml b/catroid/src/main/res/values-ml/strings.xml index 0a99cd4c5d3..97de50a04d5 100644 --- a/catroid/src/main/res/values-ml/strings.xml +++ b/catroid/src/main/res/values-ml/strings.xml @@ -1197,13 +1197,6 @@ 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 @@ -1227,7 +1220,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-ms/strings.xml b/catroid/src/main/res/values-ms/strings.xml index 302353fd505..c486a7fc484 100644 --- a/catroid/src/main/res/values-ms/strings.xml +++ b/catroid/src/main/res/values-ms/strings.xml @@ -1201,13 +1201,6 @@ 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 @@ -1220,7 +1213,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-nl/strings.xml b/catroid/src/main/res/values-nl/strings.xml index 073b4e38ed3..aa6c9c01088 100644 --- a/catroid/src/main/res/values-nl/strings.xml +++ b/catroid/src/main/res/values-nl/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploaden " - "Richt naar " - Bezig met uploaden - Upload geslaagd - Geüpload programma is afgewezen - Opnieuw proberen - Open App store "Downloaden " Bezig met downloaden Download geslaagd @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Er is een fout opgetreden tijdens het uploaden van het programma. Er is een fout opgetreden tijdens het downloaden van het programma. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-no/strings.xml b/catroid/src/main/res/values-no/strings.xml index 4978ebe4db1..dd8455838d3 100644 --- a/catroid/src/main/res/values-no/strings.xml +++ b/catroid/src/main/res/values-no/strings.xml @@ -1242,13 +1242,6 @@ Forhåndsvisningsbilde lagret Cancel project download Avbrøt nedlasting/re-konvertering av program - "Opplasting " - "Se på " - Opplasting pågår - Opplastingen var vellykket - Opplastet program avvist - Prøv på nytt - Åpne Play Store "Laster ned " Nedlasting pågår Nedlasting vellykket @@ -1261,7 +1254,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Det oppstod en feil under opplasting av programmet. Det oppstod en feil under nedlasting av programmet. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-pa-rIN/strings.xml b/catroid/src/main/res/values-pa-rIN/strings.xml index 8ce0f17b833..4415555160d 100644 --- a/catroid/src/main/res/values-pa-rIN/strings.xml +++ b/catroid/src/main/res/values-pa-rIN/strings.xml @@ -1245,13 +1245,6 @@ ਪੂਰਵਦਰਸ਼ਨ ਚਿੱਤਰ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ ਰੱਦ ਕਰੋ ਪ੍ਰਾਜੈਕਟ ਨੂੰ ਡਾਊਨਲੋਡ ਰੱਦ ਡਾਊਨਲੋਡਿੰਗ / ਪ੍ਰਵਿਸ਼ਟ ਪ੍ਰਾਜੈਕਟ ਨੂੰ - "ਅੱਪਲੋਡ" - "ਵੱਲ ਦੇਖੋ" - ਅਪਲੋਡ ਜਾਰੀ ਹੈ - ਅਪਲੋਡ ਸਫਲ - ਅਪਲੋਡ ਕੀਤਾ ਪ੍ਰੋਜੈਕਟ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ - ਮੁੜ - ਐਪ ਸਟੋਰ ਖੋਲ੍ਹੋ "ਡਾਊਨਲੋਡ" ਤਰੱਕੀ ਵਿੱਚ ਡਾਊਨਲੋਡ ਡਾਊਨਲੋਡ ਸਫਲ @@ -1264,7 +1257,6 @@ ਡਿਵਾਈਸ ਦਾ ਭੂ-ਸਥਿਤੀ ਸੰਵੇਦਕ, ਅਤੇ ਸਥਾਨਕ ਮੈਮੋਰੀ ਤੋਂ, ਐਪ ਨੂੰ ਆਯਾਤ ਅਤੇ ਨਿਰਯਾਤ ਕਰਨ ਲਈ ਇਸ ਨੂੰ ਪੜ੍ਹਨ ਅਤੇ ਲਿਖਣ ਦੀ ਪਹੁੰਚ ਦੀ ਜ਼ਰੂਰਤ ਹੈ. ਤੁਸੀਂ ਹਮੇਸ਼ਾਂ ਆਪਣੇ ਡਿਵਾਈਸ ਦੀਆਂ ਸੈਟਿੰਗਾਂ ਦੁਆਰਾ ਅਨੁਮਤੀਆਂ ਨੂੰ ਬਦਲ ਸਕਦੇ ਹੋ. - ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਅਪਲੋਡ ਕਰਨ ਵੇਲੇ ਕੁਝ ਗਲਤ ਹੋਇਆ. ਜਦਕਿ ਪ੍ਰਾਜੈਕਟ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ. "ਪ੍ਰੋਜੈਕਟ%s ਪਹਿਲਾਂ ਹੀ ਕਤਾਰ ਵਿੱਚ ਹੈ." "ਤੁਹਾਡਾ ਡਾਊਨਲੋਡ ਨਾ ਹੋ ਸਕਦਾ ਹੈ diff --git a/catroid/src/main/res/values-pl/strings.xml b/catroid/src/main/res/values-pl/strings.xml index e79544cd91c..28de2e59609 100644 --- a/catroid/src/main/res/values-pl/strings.xml +++ b/catroid/src/main/res/values-pl/strings.xml @@ -1309,13 +1309,6 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych Podgląd zapisanego obrazu Anulowane pobieranie programu Anulowano pobieranie/ponowną konwersję programu - "Wysyłanie " - "Zerknij na " - Trwa wysyłanie - Wysyłanie zakończone powodzeniem - Przesłane programu odrzucone - Spróbuj ponownie - Otwórz Sklep Play "Pobieranie " Trwa pobieranie Pobieranie zakończone powodzeniem @@ -1325,7 +1318,6 @@ Jeśli jednak nie chcesz tego robić, możesz skorzystać z naszych bezpłatnych 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. - Podczas wysyłania programu wystąpił błąd. Podczas pobierania programu wystąpił błąd. "Projekt %s jest już w kolejce." "Twoje pobieranie nie może zostać rozpoczęte diff --git a/catroid/src/main/res/values-ps/strings.xml b/catroid/src/main/res/values-ps/strings.xml index bb8f4a133c8..ad97055576f 100644 --- a/catroid/src/main/res/values-ps/strings.xml +++ b/catroid/src/main/res/values-ps/strings.xml @@ -1242,13 +1242,6 @@ د مخکتنې انځور خوندي شو د پروژې ډاونلوډ لغوه کړئ د پروژی ډاونلوډ کول / بیا رغول لغوه شوي - "پورته کول" - "وګوره ورته" - پورته کول په کار دي - اپلوډ بریالی شو - اپلوډ شوې پروژه رد شوه - بیا هڅه وکړئ - د اپلیکیشن پلورنځی خلاص کړئ "کښته کول" ډاونلوډ په پرمختګ کې دی ډاونلوډ بریالی شو @@ -1261,7 +1254,6 @@ د وسیلې جیو لوکیشن سینسر، او د محلي حافظې څخه د پروژو د واردولو او صادرولو لپاره، ایپ لوستلو او لیکلو ته اړتیا لري. تاسو کولی شئ تل د خپل وسیله تنظیماتو له لارې اجازې بدل کړئ. - د پروژې د پورته کولو په وخت کې یو څه غلط شو. د پروژې ډاونلوډ کولو پرمهال یو څه غلط شو. "پروژه %s لا دمخه په کتار کې ده." "ستاسو ډاونلوډ diff --git a/catroid/src/main/res/values-pt-rBR/strings.xml b/catroid/src/main/res/values-pt-rBR/strings.xml index b6f456a4744..2d2fd5be210 100644 --- a/catroid/src/main/res/values-pt-rBR/strings.xml +++ b/catroid/src/main/res/values-pt-rBR/strings.xml @@ -1240,13 +1240,6 @@ Pré-visualizar imagem salva Cancelar download do projeto Download/conversão do projeto cancelado - "Fazendo upload " - "Olhar para " - Upload em progresso - Upload efetuado com sucesso - O projeto foi rejeitado - Tentar novamente - Abrir loja de aplicativos "Baixando " Download em progresso Download bem-sucedido @@ -1259,7 +1252,6 @@ precisa acessar a câmera do dispositivo, o elemento de fórmula \"location\" pr dispositivo, e para importar e exportar projetos de e para a memória local, o aplicativo precisa de acesso de leitura e escrita a ele. Você sempre pode alterar as permissões nas configurações do seu dispositivo. - Algo deu errado ao enviar o projeto. Algo deu errado durante o download do projeto. "Projeto %s já está na fila." Não foi possível diff --git a/catroid/src/main/res/values-pt/strings.xml b/catroid/src/main/res/values-pt/strings.xml index 7e7ec3dc7dd..ba9e264d3b9 100644 --- a/catroid/src/main/res/values-pt/strings.xml +++ b/catroid/src/main/res/values-pt/strings.xml @@ -1243,13 +1243,6 @@ Imagem de visualização salvada Cancel project download Cancelado o programa Transferindo/reconversão - "Fazendo upload " - "Olhar para " - Upload em progresso - Upload concluído - O programa carregado foi recusado - Tentar novamente - Abrir Play Store "Baixando " Download em progresso Download concluído @@ -1262,7 +1255,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Ocorreu um erro ao fazer o upload do programa. Ocorreu um erro ao descarregar o programa. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-ro/strings.xml b/catroid/src/main/res/values-ro/strings.xml index a943de7ed5b..39080835b6d 100644 --- a/catroid/src/main/res/values-ro/strings.xml +++ b/catroid/src/main/res/values-ro/strings.xml @@ -1293,13 +1293,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Încărcare " - "Privește la " - Încărcare în curs - Încărcare reușită - Programul încărcat a fost respins - Retry - Open App store "Descărcare " Descărcare în curs Descărcarea a avut loc cu succes @@ -1312,7 +1305,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - O eroare a avut loc la încărcarea proiectului. O eroare a avut loc la descărcarea proiectului. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-ru/strings.xml b/catroid/src/main/res/values-ru/strings.xml index 57260779b83..65970cd836c 100644 --- a/catroid/src/main/res/values-ru/strings.xml +++ b/catroid/src/main/res/values-ru/strings.xml @@ -1338,13 +1338,6 @@ Превью сохранено Отменить загрузку проекта Загрузка/реконвертация проекта отменена - "Выкладывается" - "Посмотреть" - Выкладывание в процессе - Проект успешно выложен - Выкладывание проекта не удалось - Повторить - Открыть App store "Загрузка " Загрузка в процессе Загрузка завершена успешно @@ -1355,7 +1348,6 @@ Это приложение нуждается в запрашиваемых разрешениях для правильного функционирования. Например, блок камеры нуждается в доступе к камере устройства, а \"местоположение\" из редактора формул нуждается в доступе к GPS устройства, также для того, чтобы импортировать или экспортировать проекты с, и на устройство, приложению нужен доступ к внешнему хранилищу. Вы всегда можете поменять разрешения через настройки своего устройства. - Что-то пошло не так во время выкладывания проекта. Что-то пошло не так при скачивании проекта. "Проект %s уже в очереди." "Ваша загрузка не может быть запущена, diff --git a/catroid/src/main/res/values-sd/strings.xml b/catroid/src/main/res/values-sd/strings.xml index 4e15014b11d..1d96bc8a73f 100644 --- a/catroid/src/main/res/values-sd/strings.xml +++ b/catroid/src/main/res/values-sd/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading" - "Look at" - Upload in progress - Upload successful - Uploaded project rejected - ٻيهر ڪوشش ڪريو - Open App store "Downloading" Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-si/strings.xml b/catroid/src/main/res/values-si/strings.xml index 8dd3dcbebc1..f3261128a05 100644 --- a/catroid/src/main/res/values-si/strings.xml +++ b/catroid/src/main/res/values-si/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-sk/strings.xml b/catroid/src/main/res/values-sk/strings.xml index 678521d7aef..8232252b78f 100644 --- a/catroid/src/main/res/values-sk/strings.xml +++ b/catroid/src/main/res/values-sk/strings.xml @@ -1334,13 +1334,6 @@ Náhľad bol uložený Cancel project download Sťahovanie/rekonvertovanie programu zrušené - "Nahrávanie " - "Pozrite sa na " - Prebieha nahrávanie - Nahranie bolo úspešné - Nahrávaný program bol odmietnutý - Skúsiť znova - Otvoriť Obchod Play "Sťahovanie " Prebieha sťahovanie Sťahovanie bolo úspešné @@ -1353,7 +1346,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-sl/strings.xml b/catroid/src/main/res/values-sl/strings.xml index 941a0c85eb3..615353e9b16 100644 --- a/catroid/src/main/res/values-sl/strings.xml +++ b/catroid/src/main/res/values-sl/strings.xml @@ -1339,13 +1339,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading " - "Poglej k " - Upload v teku - Upload uspešen - Naložen program je zavrnjen - Poizkusi znova - Open App store "Prenašanje " Prenos se izvaja Prenos je uspel @@ -1358,7 +1351,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Med nalaganjem programa je prišlo do napake. Med prenosom programa je prišlo do napake. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-sq/strings.xml b/catroid/src/main/res/values-sq/strings.xml index fb44bd4657f..818e7d9d636 100644 --- a/catroid/src/main/res/values-sq/strings.xml +++ b/catroid/src/main/res/values-sq/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Duke Ngarkuar" - "Shiko në" - Duke u ngarkuar - Ngarkimi i sukseshëm - Uploaded project rejected - Provo përsëri - Open App store "Duke u shkarkuar" Duke u shkarkuar Shkarkimi i suksesshëm @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-sr-rCS/strings.xml b/catroid/src/main/res/values-sr-rCS/strings.xml index 6c1d34a7753..34428b6d770 100644 --- a/catroid/src/main/res/values-sr-rCS/strings.xml +++ b/catroid/src/main/res/values-sr-rCS/strings.xml @@ -1293,13 +1293,6 @@ Slika za pregled je sačuvana Otkaži preuzimanje projekta Otkazano preuzimanje/rekonvertovanje projekta - "Otpremanje" - "Pogledati na" - Otpremanje u toku - Otpremanje uspešno - Otpremljeni projekat je odbijen - Ponovi - Otvorite App store "Preuzima se" Preuzimanje u toku Preuzimanje uspešno @@ -1312,7 +1305,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Došlo je do greške prilikom otpremanja projekta. Došlo je do greške prilikom preuzimanja projekta. "Projekat %s ej već u redu." "Your download could not be diff --git a/catroid/src/main/res/values-sr-rSP/strings.xml b/catroid/src/main/res/values-sr-rSP/strings.xml index 0866520301f..99297550a92 100644 --- a/catroid/src/main/res/values-sr-rSP/strings.xml +++ b/catroid/src/main/res/values-sr-rSP/strings.xml @@ -1283,13 +1283,6 @@ Слика за преглед је сачувана Откажи преузимање пројекта Отказано је преузимање / поновно конвертовање пројекта - "Слање" - "Погледати на" - Отпремање је у току - Отпремање је успешно - Отпремљени пројекат је одбијен - Понови - Отворите Апп продавницу "Преузимање" Преузимање у току Преузимање успешно @@ -1302,7 +1295,6 @@ сензор геолокације уређаја, а у циљу увоза и извоза пројеката из и у локалну меморију, апликација треба да му се приступи читању и писању. Дозволе увек можете да мењате кроз подешавања уређаја. - Настала грешка приликом отпремању пројеката. Настала грешка приликом преузимања пројекта. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-sr/strings.xml b/catroid/src/main/res/values-sr/strings.xml index d662d78facf..a45422da528 100644 --- a/catroid/src/main/res/values-sr/strings.xml +++ b/catroid/src/main/res/values-sr/strings.xml @@ -1270,13 +1270,6 @@ Слика за преглед је сачувана Откажи преузимање пројекта Отказано је преузимање / поновно конвертовање пројекта - "Слање" - "Погледати на" - Отпремање је у току - Отпремање је успешно - Отпремљени пројекат је одбијен - Понови - Отворите Апп продавницу "Преузимање" Преузимање у току Преузимање успешно @@ -1299,7 +1292,6 @@ сензор геолокације уређаја, а у циљу увоза и извоза пројеката из и у локалну меморију, апликација треба да му се приступи читању и писању. Дозволе увек можете да мењате кроз подешавања уређаја. - Настала грешка приликом отпремању пројеката. Настала грешка приликом преузимања пројекта. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-sv/strings.xml b/catroid/src/main/res/values-sv/strings.xml index f523e509739..eef3fcaee7e 100644 --- a/catroid/src/main/res/values-sv/strings.xml +++ b/catroid/src/main/res/values-sv/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Laddar upp " - "Utseende på " - Uppladdning pågår - Uppladdningen lyckades - Uppladdade program avvisades - Försök igen - Öppna Play Store "Laddar ner " Nedladdning pågår Nedladdning slutförd @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Ett fel uppstod när du ladda upp programmet. Ett fel uppstod när du ladda ner programmet. "Projekt %s är redan i kön." "Your download could not be diff --git a/catroid/src/main/res/values-sw/strings.xml b/catroid/src/main/res/values-sw/strings.xml index 68f1e534eb8..1640afef515 100644 --- a/catroid/src/main/res/values-sw/strings.xml +++ b/catroid/src/main/res/values-sw/strings.xml @@ -1242,13 +1242,6 @@ Mwonekano wa picha iliyohifadhiwa Cancel project download Upakuaji umefutwa/inarejesha programu - "Kuweka " - "Tazama " - Inaendelea kupakia - Kupakia kumefaulu - Programu iliyopakiwa imekataliwa - Jaribu tena - Fungua Play Store "Inapakua " Inaendelea kupakua Kupakua kumefaulu @@ -1261,7 +1254,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Kosa limetokea wakati wa kupakia programu. Kosa limetokea wakati wa kupakua programu. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-ta/strings.xml b/catroid/src/main/res/values-ta/strings.xml index 1f60857865d..f0cac92caa2 100644 --- a/catroid/src/main/res/values-ta/strings.xml +++ b/catroid/src/main/res/values-ta/strings.xml @@ -1238,13 +1238,6 @@ மாதிரிக்காட்சி படம் சேமிக்கப்பட்டது திட்ட பதிவிறக்கத்தை ரத்துசெய் பதிவிறக்குதல் / மாற்றியமைத்தல் திட்டம் ரத்து செய்யப்பட்டது - "பதிவேற்றுகிறது" - "அதை நோக்கு" - பதிவேற்றம் செயலில் உள்ளது - பதிவேற்றம் வெற்றிகரமாக - பதிவேற்றிய திட்டம் நிராகரிக்கப்பட்டது - மீண்டும் முயற்சி செய் - ஆப் ஸ்டோரைத் திறக்கவும் "பதிவிறக்குகிறது" பதிவிறக்கம் செயலில் உள்ளது பதிவிறக்கம் வெற்றிகரமாக @@ -1254,7 +1247,6 @@ இந்த பயன்பாடு சரியாக செயல்பட கோரப்பட்ட அனுமதிகள் தேவை. எ.கா., கேமரா செங்கலுக்கு சாதனத்தின் கேமராவிற்கு அணுகல் தேவை, \"இருப்பிடம்\" சூத்திர உறுப்புக்கு சாதனத்தின் புவிஇருப்பிட சென்சார் அணுகல் தேவை, மேலும் உள்ளூர் நினைவகம் மற்றும் பயன்பாட்டிலிருந்து திட்டங்களை இறக்குமதி மற்றும் ஏற்றுமதி செய்ய. - திட்டத்தை பதிவேற்றும் போது ஏதோ தவறு ஏற்பட்டது. திட்டத்தைப் பதிவிறக்கும் போது ஏதோ தவறு ஏற்பட்டது. "திட்டம் %s ஏற்கனவே வரிசையில் உள்ளது." உங்கள் பதிவிறக்கத்தைத் தொடங்க முடியவில்லை, எங்கள் சேவையகத்தில் சிக்கல் இருப்பதாகத் தெரிகிறது. diff --git a/catroid/src/main/res/values-te/strings.xml b/catroid/src/main/res/values-te/strings.xml index 43c2c18d569..712c5972886 100644 --- a/catroid/src/main/res/values-te/strings.xml +++ b/catroid/src/main/res/values-te/strings.xml @@ -1247,13 +1247,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Uploading" - "Look at" - Upload in progress - Upload successful - Uploaded project rejected - మళ్ళీ ప్రయత్నించండి - Open App store "Downloading" Download in progress Download successful @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-th/strings.xml b/catroid/src/main/res/values-th/strings.xml index 4406c33420d..1592a67a5aa 100644 --- a/catroid/src/main/res/values-th/strings.xml +++ b/catroid/src/main/res/values-th/strings.xml @@ -1184,13 +1184,6 @@ ภาพตัวอย่างที่บันทึกไว้ ยกเลิกการดาวน์โหลดโครงการ ยกเลิกโครงการดาวน์โหลด / กู้คืน - "กำลังอัปโหลด " - "ดูที่ " - อัปโหลดในระหว่างดำเนินการ - อัพโหลดเสร็จสิ้น - โปรแกรมอัพโหลดถูกปฏิเสธ - ลองอีกครั้ง - เปิด App store "กำลังดาวน์โหลด" ดาวน์โหลดอยู่ ดาวน์โหลดเสร็จเรียบร้อย @@ -1200,7 +1193,6 @@ แอปนี้ต้องการสิทธิ์ที่ร้องขอเพื่อให้สามารถทำงานได้ ตัวอย่างเช่นคำสั่งของกล้องต้องการการเข้าถึงกล้องของอุปกรณ์องค์ประกอบของสูตร \"ตำแหน่ง\" ต้องการการเข้าถึงเซ็นเซอร์ตำแหน่งทางภูมิศาสตร์ของอุปกรณ์และเพื่อนำเข้าและส่งออกโครงการจากและไปยังหน่วยความจำท้องถิ่นแอปนี้จำเป็นต้องมีสิทธิ์อ่านและเขียน. คุณสามารถเปลี่ยนการอนุญาตผ่านการตั้งค่าอุปกรณ์ของคุณ - ข้อผิดพลาดเกิดขึ้นขณะอัปโหลดโปรแกรม เกิดข้อผิดพลาดในขณะดาวน์โหลดโปรแกรม "โครงการ %s อยู่ในคิวแล้ว" "การดาวน์โหลดของคุณไม่สามารถเริ่มต้นดูเหมือนว่ามีปัญหากับเซิร์ฟเวอร์ของเรา" diff --git a/catroid/src/main/res/values-tl/strings.xml b/catroid/src/main/res/values-tl/strings.xml index 28cdea29794..e9245d04e10 100644 --- a/catroid/src/main/res/values-tl/strings.xml +++ b/catroid/src/main/res/values-tl/strings.xml @@ -1245,13 +1245,6 @@ Pakiusap sumubok na lamang ng iba. 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 @@ -1264,7 +1257,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-tr/strings.xml b/catroid/src/main/res/values-tr/strings.xml index 47a3491028c..acac73f2e64 100644 --- a/catroid/src/main/res/values-tr/strings.xml +++ b/catroid/src/main/res/values-tr/strings.xml @@ -1210,13 +1210,6 @@ bekleyin Önizleme resmi kaydedildi Proje indirmeyi iptal et Programı indirme/yeniden dönüştürme iptal edildi - "Catrobat topluluğuna yükleniyor " - "Bak " - Topluluğa Yükleme Devam Ediyor - Yükleme Başarılı - Yüklenen proje rededildi - Yeniden deneyin - Uygulama mağazasını aç "İndiriliyor…" İndirme devam ediyor… İndirme başarılı oldu @@ -1226,7 +1219,6 @@ bekleyin 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. - Programı yüklerken bir hata oluştu. Programı yüklerken bir hata oluştu. "%s projesi zaten sırada." İndirme işleminiz başlatılamadı, sunucumuzda bir sorun var gibi görünüyor. diff --git a/catroid/src/main/res/values-tw/strings.xml b/catroid/src/main/res/values-tw/strings.xml index 18950f665d3..e9c27e9d2b1 100644 --- a/catroid/src/main/res/values-tw/strings.xml +++ b/catroid/src/main/res/values-tw/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-uk/strings.xml b/catroid/src/main/res/values-uk/strings.xml index 4fda6daa154..836b17c4beb 100644 --- a/catroid/src/main/res/values-uk/strings.xml +++ b/catroid/src/main/res/values-uk/strings.xml @@ -1338,13 +1338,6 @@ Зображення проєкту збережено Скасувати завантаження проєкту Скасовано завантаження/повторне конвертування проєкту - "Вивантаження" - "Подивитися на" - Триває вивантаження - Успішно завантажено - Вивантаження проєкту відхилено - Повторити - Відкрити App store "Завантаження" Триває завантаження Успішно завантажено @@ -1354,7 +1347,6 @@ Ця програма потребує запитаних дозволів для належного функціонування. Наприклад, цеглина камери потребує доступу до камери пристрою, елемент формули «розташування» потребує доступу до датчика геолокації пристрою, а для імпорту та експорту проєктів з та до локальної пам\'яті додаток потребує доступу до нього для читання та запису. Ви завжди можете змінити дозволи в налаштуваннях пристрою. - Щось пішло не так під час вивантаження проєкту. Щось пішло не так під час завантаження проєкту. "Проєкт %s уже в черзі." \"Ваше завантаження не може бути diff --git a/catroid/src/main/res/values-ur/strings.xml b/catroid/src/main/res/values-ur/strings.xml index b6848dd60dd..c5928ec1fb5 100644 --- a/catroid/src/main/res/values-ur/strings.xml +++ b/catroid/src/main/res/values-ur/strings.xml @@ -1223,13 +1223,6 @@ پیش منظر تصویر محفوظ پروجیکٹ ڈاؤن لوڈ منسوخ کریں منسوخ ڈاؤن لوڈ / منصوبے کی بحالی - "اپ لوڈ کررہا ہے" - "پر دیکھو" - اپ لوڈنگ جاری ہے - اپ لوڈ کامیاب - اپ لوڈ کردہ منصوبے کو مسترد کر دیا - دوبارہ کوشش کریں - اپلی کیشن اسٹور کھولیں "ڈاؤن لوڈ کیا جا رہا ہے …" ڈاؤن لوڈ جاری ہے ڈاؤن لوڈ کامیاب @@ -1242,7 +1235,6 @@ آلے کے جغرافیائیشن سینسر، اور مقامی میموری سے اور مقامی میموری پر درآمد اور برآمد کرنے کے لئے اس تک رسائی پڑھنے اور لکھنے کی ضرورت ہے. آپ ہمیشہ اپنے آلات کی ترتیبات کے ذریعے اجازت کو تبدیل کرسکتے ہیں. - اس منصوبے کو اپ لوڈ کرتے وقت کچھ غلط ہوگیا. منصوبے کو ڈاؤن لوڈ کرتے ہوئے کچھ غلط ہوگیا. "پروجیکٹ %s پہلے ہی قطار میں ہے۔" "آپ کا ڈاؤن لوڈ diff --git a/catroid/src/main/res/values-uz/strings.xml b/catroid/src/main/res/values-uz/strings.xml index 50d9b713a42..47f0bbaf73a 100644 --- a/catroid/src/main/res/values-uz/strings.xml +++ b/catroid/src/main/res/values-uz/strings.xml @@ -1247,13 +1247,6 @@ 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 @@ -1266,7 +1259,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-vi/strings.xml b/catroid/src/main/res/values-vi/strings.xml index eb1b7f14c55..769e8622efe 100644 --- a/catroid/src/main/res/values-vi/strings.xml +++ b/catroid/src/main/res/values-vi/strings.xml @@ -1201,13 +1201,6 @@ Preview image saved Cancel project download Canceled downloading/reconverting project - "Đang tải lên " - "Nhìn vào " - Tải lên đang diễn ra - Tải lên thành công - Chương trình được tải lên bị từ chối - Thử lại - Open App store "Đang tải về " Tải xuống đang diễn ra Tải về thành công @@ -1220,7 +1213,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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. - Lỗi xảy ra trong khi tải lên chương trình. Một lỗi xảy ra trong khi tải về chương trình. "Project %s already in queue." "Your download could not be diff --git a/catroid/src/main/res/values-yo-rNG/strings.xml b/catroid/src/main/res/values-yo-rNG/strings.xml index 915bad58ae3..54bb5f7bf5d 100644 --- a/catroid/src/main/res/values-yo-rNG/strings.xml +++ b/catroid/src/main/res/values-yo-rNG/strings.xml @@ -1201,13 +1201,6 @@ 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 @@ -1220,7 +1213,6 @@ Camera brick needs access to the device\'s camera, the \"location\" formula elem 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 diff --git a/catroid/src/main/res/values-zh-rCN/strings.xml b/catroid/src/main/res/values-zh-rCN/strings.xml index d319ba4f4c8..4fcfafb4b68 100644 --- a/catroid/src/main/res/values-zh-rCN/strings.xml +++ b/catroid/src/main/res/values-zh-rCN/strings.xml @@ -1184,13 +1184,6 @@ dash(-), 下划线 (_), 和 句号(.). 预览图像已保存 取消项目下载 已取消下载/重新转换程序 - "上传中 " - "查看 " - 正在上传 - 上传成功 - 上传的程序被拒绝 - 重试 - 打开Play Store "下载中 " 正在下载 下载完成 @@ -1203,7 +1196,6 @@ dash(-), 下划线 (_), 和 句号(.). 设备的地理位置传感器。 并且为了从本地内存导入和导出项目，应用程序 需要读写访问它。 您总是可以通过您的设备的设置更改权限。 - 在上传程序的时候发生了一个错误。 下载程序时发生了一个错误。 "项目 %s 已在队列中。" \"您的下载无法开始，似乎我们的服务器有问题。 diff --git a/catroid/src/main/res/values-zh-rTW/strings.xml b/catroid/src/main/res/values-zh-rTW/strings.xml index 192677e2267..cac83db8115 100644 --- a/catroid/src/main/res/values-zh-rTW/strings.xml +++ b/catroid/src/main/res/values-zh-rTW/strings.xml @@ -1198,13 +1198,6 @@ 預覽圖像已保存 取消項目下載 取消下載/重新轉換項目 - "上傳中 " - "檢視 " - 上傳進行中 - 上傳成功 - 上傳程式檔被拒絕 - 重試 - 打開應用商店 "下載中 " 下載進行中 下載成功 @@ -1217,7 +1210,6 @@ 設備的地理定位傳感器，為了從本地內存導入和導出項目，應用程序 需要對其進行讀寫訪問。您可以隨時通過設備設置更改權限。 - 上傳程式檔時出錯。 下載程式檔時出錯。 "項目 %s 已在隊列中。" “您的下載不能 diff --git a/catroid/src/main/res/values/strings.xml b/catroid/src/main/res/values/strings.xml index 4dbda154ca7..154f6af04e4 100644 --- a/catroid/src/main/res/values/strings.xml +++ b/catroid/src/main/res/values/strings.xml @@ -1384,13 +1384,6 @@ 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 @@ -1405,7 +1398,6 @@ device\'s geolocation sensor, and in order to import and export projects from an 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