Skip to content

Commit

Permalink
git subrepo pull uno
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "uno"
  merged:   "7ab861e"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "7ab861e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
  • Loading branch information
prrvchr committed Dec 16, 2023
1 parent 5f7c7ac commit 9f26fa0
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = 42cc710103e300e096cc33019760fef95666c722
parent = b9be5c180aaa24556b27ea8210da43233024a90a
commit = 7ab861e71a9b1ceea91630a678fa70d34dc54c53
parent = 5f7c7ac41f570dfba548edf6382659489dc1bf2e
method = merge
cmdver = 0.4.3
9 changes: 9 additions & 0 deletions uno/resource/ucb/Replicator_en_US.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@
144=Has replicated the file: %s of %s size: %s
145=Has replicated the file/folder's trashed: %s of %s


400=DataBase.__init__()
401=DataBase: Loading completed

410=DataBase.createDataBase()
411=Try to create the database with HsqlDB version: %s
412=Successful database creation
413=Unable to create database: installed HsqlDB version: %s is lower than minimum supported version: %s

9 changes: 9 additions & 0 deletions uno/resource/ucb/Replicator_fr_FR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@
144=A repliqu\u00e9 la mise \u00e0 jour du fichier: '%s' du %s d'une taille de: %s
145=A repliqu\u00e9 la mise \u00e0 jour de l'effacement du fichier/r\u00e9p\u00e9rtoire: %s du %s
400=DataBase.__init__()
401=DataBase: Chargement termin\u00e9
410=DataBase.createDataBase()
411=Essaie de créer la base de données avec HsqlDB version: %s
412=Création réussie de la base de données
413=Impossible de créer la base de données : la version de HsqlDB installée: %s est inférieure à la version minimale prise en charge: %s

0 comments on commit 9f26fa0

Please sign in to comment.