Commit e31b9265 authored by jordibgzashtita's avatar jordibgzashtita
Browse files

Merge remote-tracking branch 'develor/develop' into jordibgzashtita

parents 192edc6f cf7ef6ca
Loading
Loading
Loading
Loading
Loading
+507 −7

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Diff line number Diff line
@@ -1067,4 +1067,5 @@
    <string name="timeline_scrollbar">タイムラインにスクロールバーを表示する</string>
    <string name="Pronouns">代名詞</string>
    <string name="pronouns_support">代名詞のサポート</string>
    <string name="qr_code_generator">QRコード作成</string>
</resources>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
    <string name="validate">Validează</string>
    <string name="media">Media</string>
    <string name="share_with">Distribuie cu</string>
    <string name="shared_via">Distribuie via Fedilab</string>
    <string name="shared_via">Distribuit via Fedilab</string>
    <string name="replies">Răspunsuri</string>
    <string name="username">Utilizator</string>
    <string name="drafts">Ciorne</string>