marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2023-04-27 02:29:47 +00:00
parent 54e9ced5b4
commit b37b5fc8a3
5 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
containments/homescreens/folio/package/metadata.json
View file

@ -69,6 +69,7 @@
"Name": "Folio", "Name": "Folio",
"Name[ca@valencia]": "Folio", "Name[ca@valencia]": "Folio",
"Name[ca]": "Folio", "Name[ca]": "Folio",
"Name[de]": "Folio",
"Name[en_GB]": "Folio", "Name[en_GB]": "Folio",
"Name[eo]": "Folio", "Name[eo]": "Folio",
"Name[es]": "Folio", "Name[es]": "Folio",

1
containments/homescreens/halcyon/package/metadata.json
View file

@ -71,6 +71,7 @@
"Name[az]": "Halcyon", "Name[az]": "Halcyon",
"Name[ca@valencia]": "Halcyon", "Name[ca@valencia]": "Halcyon",
"Name[ca]": "Halcyon", "Name[ca]": "Halcyon",
"Name[de]": "Halcyon",
"Name[en_GB]": "Halcyon", "Name[en_GB]": "Halcyon",
"Name[eo]": "Halcyon", "Name[eo]": "Halcyon",
"Name[es]": "Halcyon", "Name[es]": "Halcyon",

1
initialstart/modules/cellular/package/metadata.json
View file

@ -61,6 +61,7 @@
"Name[ca@valencia]": "Mòbil", "Name[ca@valencia]": "Mòbil",
"Name[ca]": "Mòbil", "Name[ca]": "Mòbil",
"Name[cs]": "Mobilní", "Name[cs]": "Mobilní",
"Name[de]": "Mobilfunk",
"Name[en_GB]": "Cellular", "Name[en_GB]": "Cellular",
"Name[eo]": "Ĉela", "Name[eo]": "Ĉela",
"Name[es]": "Móvil", "Name[es]": "Móvil",

1
initialstart/modules/finished/metadata.json
View file

@ -61,6 +61,7 @@
"Name[ca@valencia]": "Finalitzat", "Name[ca@valencia]": "Finalitzat",
"Name[ca]": "Finalitzat", "Name[ca]": "Finalitzat",
"Name[cs]": "Dokončeno", "Name[cs]": "Dokončeno",
"Name[de]": "Abgeschlossen",
"Name[en_GB]": "Finished", "Name[en_GB]": "Finished",
"Name[eo]": "Finita", "Name[eo]": "Finita",
"Name[es]": "Finalizado", "Name[es]": "Finalizado",

1
initialstart/modules/wifi/package/metadata.json
View file

@ -60,6 +60,7 @@
"Name": "WiFi", "Name": "WiFi",
"Name[ca@valencia]": "Wi-Fi", "Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi", "Name[ca]": "Wi-Fi",
"Name[de]": "Wi-Fi",
"Name[en_GB]": "WiFi", "Name[en_GB]": "WiFi",
"Name[eo]": "WiFi", "Name[eo]": "WiFi",
"Name[es]": "Wifi", "Name[es]": "Wifi",