Merge branch 'fix_comment_string' into 'master'

Fix comment string being both verb and noun

See merge request pixeldroid/PixelDroid!565

app/src/main/res/layout/activity_post.xml

@@ -56,7 +56,7 @@
                             android:id="@+id/editComment"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="@string/comment"
+                            android:hint="@string/comment_noun"
                             android:importantForAutofill="no"
                             android:inputType="text|textCapSentences|textMultiLine" />
                     </com.google.android.material.textfield.TextInputLayout>
@@ -67,7 +67,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="8dp"
                         android:contentDescription="@string/submit_comment"
-                        android:text="@string/comment"
+                        android:text="@string/comment_verb"
                         app:layout_constraintBottom_toBottomOf="@+id/textInputLayout2"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/textInputLayout2"

app/src/main/res/values-ar/strings.xml

@@ -48,7 +48,7 @@
     <string name="loading_toast">حدث خلل اثناء التحميل</string>
     <string name="upload_post_error">فشل في تحميل المنشور</string>
 
-    <string name="comment">تعليق</string>
+    <string name="comment_verb">تعليق</string>
     <string name="comment_posted">التعليق: تم نشر%1$s!</string>
     <string name="comment_error">خطأ في التعليق!</string>
     <string name="share_image">مشاركة الصورة</string>

app/src/main/res/values-ca/strings.xml

@@ -56,7 +56,7 @@
     <string name="follow_error">No s\'ha pogut seguir</string>
     <string name="follow_button_failed">No s\'ha pogut mostrar el botó de seguir</string>
     <string name="follow_status_failed">No s\'ha pogut obtenir l\'estat de seguiment</string>
-    <string name="comment">Comentari</string>
+    <string name="comment_verb">Comentari</string>
     <string name="comment_posted">Comentari: %1$s publicat!</string>
     <string name="comment_error">Error de comentari!</string>
     <string name="share_image">Compartir imatge</string>

app/src/main/res/values-cs/strings.xml

@@ -72,7 +72,7 @@
     <string name="share_image">Sdílet obrázek</string>
     <string name="comment_error">Chyba komentáře!</string>
     <string name="comment_posted">Komentář: %1$s zveřejněn!</string>
-    <string name="comment">Komentář</string>
+    <string name="comment_verb">Komentář</string>
     <plurals name="number_comments">
         <item quantity="one">%d komentář</item>
         <item quantity="few">%d komentáře</item>

app/src/main/res/values-de/strings.xml

@@ -45,7 +45,7 @@
     <string name="add_account_description">Weiteres Pixelfed-Konto hinzufügen</string>
     <string name="light_theme">Hell</string>
     <string name="dark_theme">Dunkel</string>
-    <string name="comment">Kommentieren</string>
+    <string name="comment_verb">Kommentieren</string>
     <string name="share_image">Bild teilen</string>
     <string name="empty_comment">Der Kommentar darf nicht leer sein!</string>
     <string name="no_description">Keine Beschreibung</string>

app/src/main/res/values-es/strings.xml

@@ -60,7 +60,7 @@
     <string name="follow_error">No pudo seguir</string>
     <string name="follow_button_failed">No se pudo mostrar el botón de seguimiento</string>
     <string name="follow_status_failed">No se pudo obtener el estado de seguidores</string>
-    <string name="comment">Comentar</string>
+    <string name="comment_verb">Comentar</string>
     <string name="comment_posted">¡Comentario: %1$s publicado!</string>
     <string name="comment_error">¡Error al comentar!</string>
     <string name="share_image">Compartir imagen</string>

app/src/main/res/values-eu/strings.xml

@@ -75,7 +75,7 @@
     <string name="follow_error">Ezin izan da jarraitu</string>
     <string name="follow_button_failed">Ezin izan da jarraipen-botoia erakutsi</string>
     <string name="follow_status_failed">Ezin izan da segimendu-egoera lortu</string>
-    <string name="comment">Iruzkin</string>
+    <string name="comment_verb">Iruzkin</string>
     <string name="posted_on">%1$s(e)n argitaratua</string>
     <string name="hashtags">TRAOLAK</string>
     <string name="accounts">KONTUAK</string>

app/src/main/res/values-fa/strings.xml

@@ -59,7 +59,7 @@
     <string name="share_image">هم‌رسانی تصویر</string>
     <string name="comment_error">خطا در درج نظر!</string>
     <string name="comment_posted">نظر: %1$s منتشر کرد!</string>
-    <string name="comment">نظر</string>
+    <string name="comment_verb">نظر</string>
     <string name="follow_status_failed">نتوانستیم وضعیت پی‌گیری را دریافت کنیم</string>
     <string name="follow_button_failed">نتوانستیم دکمه پی‌گیری را نمایش دهیم</string>
     <string name="follow_error">نتوانستیم پی‌گیری کنیم</string>

app/src/main/res/values-fi/strings.xml

@@ -108,7 +108,7 @@
     <string name="search">Hae</string>
     <string name="unfollow">Seurataan</string>
     <string name="follow">Seuraa</string>
-    <string name="comment">Kommentti</string>
+    <string name="comment_verb">Kommentti</string>
     <string name="image_download_downloading">Ladataan…</string>
     <string name="gallery_button_alt">Galleria</string>
     <string name="edit">Muokkaa</string>

app/src/main/res/values-fr/strings.xml

@@ -59,7 +59,7 @@
     <string name="share_image">Partager image</string>
     <string name="comment_error">Erreur de commentaire !</string>
     <string name="comment_posted">Commentaire : %1$s publié !</string>
-    <string name="comment">Commenter</string>
+    <string name="comment_verb">Commenter</string>
     <string name="follow_status_failed">Impossible d\'obtenir l\'état de suivi</string>
     <string name="follow_button_failed">Impossible d\'afficher le bouton de suivi</string>
     <string name="follow_error">Impossible de suivre</string>

app/src/main/res/values-gl/strings.xml

@@ -57,7 +57,7 @@
     <string name="follow_error">Non se puido seguir</string>
     <string name="follow_button_failed">Non se pode mostrar o botón para seguir</string>
     <string name="follow_status_failed">Non se obtivo o estado de relacións</string>
-    <string name="comment">Comentar</string>
+    <string name="comment_verb">Comentar</string>
     <string name="comment_posted">Comentario: %1$s publicado!</string>
     <string name="comment_error">Fallo ao comentar!</string>
     <string name="share_image">Compartir Imaxe</string>

app/src/main/res/values-hu/strings.xml

@@ -102,7 +102,7 @@
         <item quantity="one">%d hozzászólás</item>
         <item quantity="other">%d hozzászólás</item>
     </plurals>
-    <string name="comment">Hozzászólás</string>
+    <string name="comment_verb">Hozzászólás</string>
     <string name="comment_posted">Hozzászólás: %1$s közzétéve!</string>
     <string name="comment_error">Hozzászólási hiba!</string>
     <string name="share_image">Kép megosztása</string>

app/src/main/res/values-id/strings.xml

@@ -38,7 +38,7 @@
     <string name="empty_comment">Komentar tidak boleh kosong!</string>
     <string name="share_image">Bagikan Gambar</string>
     <string name="comment_posted">Komentar: %1$s diposting!</string>
-    <string name="comment">Komentar</string>
+    <string name="comment_verb">Komentar</string>
     <plurals name="number_comments">
         <item quantity="other">%d komentar</item>
     </plurals>

app/src/main/res/values-it/strings.xml

@@ -56,7 +56,7 @@
     <string name="share_image">Condividi immagine</string>
     <string name="comment_error">Errore nel commento!</string>
     <string name="comment_posted">Commento: %1$s postato!</string>
-    <string name="comment">Commento</string>
+    <string name="comment_verb">Commento</string>
     <string name="follow_error">Impossibile seguire</string>
     <string name="unfollow_error">Impossibile smettere di seguire</string>
     <string name="access_token_invalid">Il token di accesso non è valido</string>

app/src/main/res/values-ja/strings.xml

@@ -64,7 +64,7 @@
     <string name="follow_error">フォローできませんでした</string>
     <string name="follow_button_failed">フォローボタンを表示できませんでした</string>
     <string name="follow_status_failed">フォローステータスを取得できませんでした</string>
-    <string name="comment">コメント</string>
+    <string name="comment_verb">コメント</string>
     <string name="comment_error">コメントエラー</string>
     <string name="share_image">画像を共有</string>
     <string name="no_description">説明はありません</string>

app/src/main/res/values-nl/strings.xml

@@ -66,7 +66,7 @@
     <string name="instance_error">Kon instance-informatie niet ophalen</string>
     <string name="request_format_error">Fout bij het uploaden: slecht verzoekformaat</string>
     <string name="posted_on">Gepost op %1$s</string>
-    <string name="comment">Commentaar maken</string>
+    <string name="comment_verb">Commentaar maken</string>
     <string name="comment_posted">Commentaar: %1$s gepost!</string>
     <string name="comment_error">Fout met commentaar!</string>
     <string name="share_image">Afbeelding delen</string>

app/src/main/res/values-pl/strings.xml

@@ -43,7 +43,7 @@
     <string name="share_image">Udostępnij</string>
     <string name="comment_error">Błąd komentarza!</string>
     <string name="comment_posted">Komentarz: %1$s opublikowany!</string>
-    <string name="comment">Komentarz</string>
+    <string name="comment_verb">Komentarz</string>
     <string name="menu_account">Mój profil</string>
     <string name="registration_failed">Nie udało się zarejestrować aplikacji na tym serwerze</string>
     <string name="instance_error">Nie udało się pobrać informacji o instancji</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -158,7 +158,7 @@
     <string name="unfollow_error">Não foi possível deixar de seguir</string>
     <string name="action_not_allowed">Esta ação não é permitida</string>
     <string name="follow_error">Não foi possível seguir</string>
-    <string name="comment">Comentar</string>
+    <string name="comment_verb">Comentar</string>
     <plurals name="description_max_characters">
         <item quantity="one">A descrição precisa ter pelo menos %d carácter.</item>
         <item quantity="other">A descrição precisa ter pelo menos %d caracteres.</item>

app/src/main/res/values-pt/strings.xml

@@ -85,7 +85,7 @@
     <string name="comment_error">Erro ao comentar!</string>
     <string name="write_permission_download_pic">Precisa adicionar a permissão para transferir imagens!</string>
     <string name="comment_posted">Comentário: %1$s publicou!</string>
-    <string name="comment">Comentário</string>
+    <string name="comment_verb">Comentário</string>
     <string name="add_comment">Adicionar um comentário</string>
     <string name="submit_comment">Submeter comentário</string>
     <string name="post_is_album">Esta publicação é um álbum</string>

app/src/main/res/values-ru/strings.xml

@@ -37,7 +37,7 @@
     <string name="add_account_description">Добавить другой аккаунт Pixelfed</string>
     <string name="add_account_name">Добавить аккаунт</string>
     <string name="instance_error">Не удалось получить информацию об экземпляре</string>
-    <string name="comment">Комментировать</string>
+    <string name="comment_verb">Комментировать</string>
     <string name="comment_posted">Комментарий: %1$s опубликован!</string>
     <string name="comment_error">Ошибка комментирования!</string>
     <string name="share_image">Поделиться изображением</string>

app/src/main/res/values-sv/strings.xml

@@ -60,7 +60,7 @@
     <string name="follow_error">Kunde inte följa</string>
     <string name="follow_button_failed">Kunde inte visa följarknapp</string>
     <string name="follow_status_failed">Kunde inte hämta status för följare</string>
-    <string name="comment">Kommentera</string>
+    <string name="comment_verb">Kommentera</string>
     <string name="comment_posted">Kommentar: %1$s inlagd!</string>
     <string name="comment_error">Kommentarsfel!</string>
     <string name="share_image">Dela bild</string>

app/src/main/res/values-uk/strings.xml

@@ -80,7 +80,7 @@
     <string name="instance_not_pixelfed_cancel">Скасувати вхід</string>
     <string name="request_format_error">Помилка вивантаження: хибний формат запиту</string>
     <string name="connect_to_pixelfed">З\'єднатися з Pixelfed</string>
-    <string name="comment">Коментар</string>
+    <string name="comment_verb">Коментар</string>
     <plurals name="nb_posts">
         <item quantity="one">%d
 \nдопис</item>

app/src/main/res/values-zh-rCN/strings.xml

@@ -60,7 +60,7 @@
     <string name="follow_error">无法关注</string>
     <string name="follow_button_failed">无法显示关注按钮</string>
     <string name="follow_status_failed">无法获得关注状态</string>
-    <string name="comment">评论</string>
+    <string name="comment_verb">评论</string>
     <string name="comment_posted">评论： %1$s 已发布！</string>
     <string name="comment_error">评论错误！</string>
     <string name="share_image">分享图像</string>

app/src/main/res/values/strings.xml

@@ -153,7 +153,10 @@ For more info about Pixelfed, you can check here: https://pixelfed.org"</string>
     <string name="share_image">Share Image</string>
     <string name="comment_error">Comment error!</string>
     <string name="comment_posted">"Comment: %1$s posted!"</string>
-    <string name="comment">Comment</string>
+    <!-- This is shown on the button, it is a verb and refers to the action of commenting -->
+    <string name="comment_verb">Comment</string>
+    <!-- This is shown in the text field as a hint, it is a noun -->
+    <string name="comment_noun">Comment</string>
     <plurals name="number_comments">
         <item quantity="one">%d comment</item>
         <item quantity="other">%d comments</item>