diff options
| author | l10n daemon script <[email protected]> | 2024-08-10 01:29:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-10 01:29:40 +0000 |
| commit | bc6803eeefd3d9c9a2f426f5677dd8373a37343a (patch) | |
| tree | 77243646a9de9399896ea99c4b0142427ff31b85 /src | |
| parent | f122b2e04aa89e0dce5a4f83bb3b9dba950d9985 (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"
Diffstat (limited to 'src')
| -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 bb8bb48e9..2dd9eb815 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -16,6 +16,7 @@ "Name[es]": "Mover a una nueva carpeta", "Name[eu]": "Eraman karpeta berrira", "Name[fr]": "Déplacer vers le nouveau dossier", + "Name[gl]": "Mover a un novo cartafol", "Name[he]": "העברה לתיקייה חדשה", "Name[hu]": "Áthelyezés új mappába", "Name[ia]": "Move a nove dossier", |