Gitea
/
GitNex-Android-App
mirror of https://codeberg.org/gitnex/GitNex
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into import-export-data 

# Conflicts:
#	app/src/main/res/values-de-rDE/strings.xml
#	app/src/main/res/values-fr-rFR/strings.xml
This commit is contained in:
M M Arif 2024-03-24 16:15:48 +05:00
parent 5cee335928 ba3ad3c475
commit 650984f671
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values-de-rDE/strings.xml
View File

@ -739,7 +739,7 @@
<string name="timelineRefPr">%1$s hat diesen Pull-Request %3$s in #%2$d erwähnt</string>
<string name="timelineStatusRefIssue"><![CDATA[%1$s hat diesen Issue von einem <font color=\'%2$d\'>%3$s</font> %4$s referenziert]]></string>
<string name="timelineReviewLeftComment">%1$s hat einen Kommentar hinterlassen: %2$s %3$s</string>
<string name="timelinePinned">%1$s pinned this %2$s</string>
<string name="timelinePinned">%1$s hat das %2$s angepinnt</string>
<string name="commitStatuses">Status</string>
<string name="statusNoUrl">Dieser Status hat keine Ziel-URL.</string>
<string name="starredRepos">Favoriten</string>

2
app/src/main/res/values-fr-rFR/strings.xml
View File

@ -739,7 +739,7 @@
<string name="timelineRefPr">%1$s a mentionné cette demande d’ajout dans #%2$d %3$s</string>
<string name="timelineStatusRefIssue"><![CDATA[%1$s mentionné ce ticket dans une <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
<string name="timelineReviewLeftComment">%1$s a ajouté un commentaire : %2$s %3$s</string>
<string name="timelinePinned">%1$s pinned this %2$s</string>
<string name="timelinePinned">%1$s a épinglé cette %2$s</string>
<string name="commitStatuses">Statuts</string>
<string name="statusNoUrl">Ce statut n’a pas d’URL.</string>
<string name="starredRepos">Dépôts favoris</string>