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 Feb 5, 2023
1 parent 5d002a4 commit e31f3c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions kcm/kcm_kdeconnect.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"Description[is]": "Tengja og samstilla tækin þín",
"Description[it]": "Connetti e sincronizza i tuoi dispositivi",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[lt]": "Prijunkite ir sinchronizuokite savo įrenginius",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[nn]": "Kopla til og synkroniser einingar",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
Expand All @@ -40,6 +41,7 @@
"Name[is]": "KDE Connect",
"Name[it]": "KDE Connect",
"Name[ka]": "KDE Connect",
"Name[lt]": "KDE Connect",
"Name[nl]": "KDE Connect",
"Name[nn]": "KDE Connect",
"Name[pl]": "KDE Connect",
Expand Down
2 changes: 2 additions & 0 deletions plugins/mmtelephony/kdeconnect_mmtelephony.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"Name[is]": "Yoram Bar-Haim",
"Name[it]": "Yoram Bar-Haim",
"Name[ka]": "Yoram Bar-Haim",
"Name[lt]": "Yoram Bar-Haim",
"Name[nl]": "Yoram Bar-Haim",
"Name[nn]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
Expand Down Expand Up @@ -88,6 +89,7 @@
"Name[is]": "ModemManager samþætting símaaðgerða",
"Name[it]": "Integrazione telefonica di ModemManager",
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
"Name[lt]": "ModemManager telefonijos integracija",
"Name[nl]": "Modembeheerder telefoonintegratie",
"Name[nn]": "ModemManager-telefoniintegrering",
"Name[pl]": "Integracja z telefonią zarządzania modemem",
Expand Down

0 comments on commit e31f3c4

Please sign in to comment.