Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
l10n daemon script committed Aug 28, 2024
1 parent 6dc8b00 commit 7944df1
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/kcm/kcm_krdpserver.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Description[ca@valencia]": "Configureu escriptori remot",
"Description[ca]": "Configuració d'escriptori remot",
"Description[cs]": "Nastavit vzdálenou plochu",
"Description[en_GB]": "Configure Remote Desktop",
"Description[eo]": "Agordi Foran Labortablon",
"Description[es]": "Configurar el escritorio remoto",
"Description[eu]": "Konfiguratu urruneko mahaigaina",
Expand Down Expand Up @@ -39,6 +40,7 @@
"Name[ca@valencia]": "Escriptori remot",
"Name[ca]": "Escriptori remot",
"Name[cs]": "Vzdálená plocha",
"Name[en_GB]": "Remote Desktop",
"Name[eo]": "Fora Labortablo",
"Name[es]": "Escritorio remoto",
"Name[eu]": "Urruneko mahaigaina",
Expand Down

0 comments on commit 7944df1

Please sign in to comment.