diff options
| author | l10n daemon script <[email protected]> | 2024-06-30 01:20:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-30 01:20:00 +0000 |
| commit | 5eb3240e165ba9875c54ac47c4badf0260653d47 (patch) | |
| tree | 9eeee6af17a5a94af188e264219d399618e25f3b | |
| parent | 44b05452c3b22a38127f0afa56a23365db23b8c0 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 1b040416f..99fdbccd2 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -13,6 +13,7 @@ "Name[cs]": "Přesunout do nové složky", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", + "Name[eu]": "Eraman karpeta berrira", "Name[fr]": "Déplacer vers le nouveau dossier", "Name[he]": "העברה לתיקייה חדשה", "Name[ia]": "Move a nove dossier", |