mirror of
https://invent.kde.org/system/dolphin
synced 2024-07-04 17:30:55 +00:00
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"
This commit is contained in:
parent
44b05452c3
commit
5eb3240e16
|
@ -13,6 +13,7 @@
|
||||||
"Name[cs]": "Přesunout do nové složky",
|
"Name[cs]": "Přesunout do nové složky",
|
||||||
"Name[eo]": "Movi al Nova Dosierujo",
|
"Name[eo]": "Movi al Nova Dosierujo",
|
||||||
"Name[es]": "Mover a una nueva carpeta",
|
"Name[es]": "Mover a una nueva carpeta",
|
||||||
|
"Name[eu]": "Eraman karpeta berrira",
|
||||||
"Name[fr]": "Déplacer vers le nouveau dossier",
|
"Name[fr]": "Déplacer vers le nouveau dossier",
|
||||||
"Name[he]": "העברה לתיקייה חדשה",
|
"Name[he]": "העברה לתיקייה חדשה",
|
||||||
"Name[ia]": "Move a nove dossier",
|
"Name[ia]": "Move a nove dossier",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user